Attachment 31066 Details for Bug 24950 – Really serialize the linking after the subdirs

[patch] Really serialize the linking after the subdirs

ensure-dri-subdirs.patch (text/plain), 1.23 KB, created by Dan Nicholson on 2009-11-09 05:58:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nicholson

Created: 2009-11-09 05:58:21 UTC

Size: 1.23 KB

patch

obsolete

>From ad4cac4c05dc9522e68512d5faef3089679942f1 Mon Sep 17 00:00:00 2001
>From: Dan Nicholson <dbn.lists@gmail.com>
>Date: Mon, 9 Nov 2009 05:51:23 -0800
>Subject: [PATCH] dri: Ensure subdirs have finished before linking driver
>
>Recursive make is hard. If there are subdirectories in the DRI drivers,
>it's pretty certain we want to finish building in them before linking
>the driver. Add a new target to serialize the rules.
>
>Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
>---
> src/mesa/drivers/dri/Makefile.template |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
>index 1ce9315..39d25ce 100644
>--- a/src/mesa/drivers/dri/Makefile.template
>+++ b/src/mesa/drivers/dri/Makefile.template
>@@ -60,9 +60,13 @@ SHARED_INCLUDES = \
> 
> ##### TARGETS #####
> 
>-default: symlinks subdirs depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
>+default: subdirs lib
> 
> 
>+.PHONY: lib
>+lib: symlinks subdirs depend
>+	@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
>+
> $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
> 		$(TOP)/src/mesa/drivers/dri/Makefile.template
> 	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
>-- 
>1.6.2.5
>

Actions: View | Splinter Review

Attachments on bug 24950: 30999 | 31017 | 31019 | 31050 | 31054 | 31066

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.