From 33474c4fff35faaedbd93461acb24496160f820f Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 22 Jun 2010 09:31:32 +0200 Subject: sb126: #i110197# remove -Wl,-z,noexecstack hack --- berkeleydb/makefile.mk | 2 +- cairo/cairo/makefile.mk | 2 +- cairo/pixman/makefile.mk | 2 +- curl/makefile.mk | 4 ---- icu/makefile.mk | 5 ----- libxml2/makefile.mk | 4 ---- libxslt/makefile.mk | 2 +- python/makefile.mk | 4 ---- 8 files changed, 4 insertions(+), 21 deletions(-) diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 963c61a3bbde..6b814163300b 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -76,7 +76,7 @@ CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index e0b12cc9f551..564c5dd9995a 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -122,7 +122,7 @@ OUT2INC+=src$/cairo-quartz.h .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ELIF "$(OS)$(COM)"=="SOLARISC52" cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 20773c7597f8..4f8e5ca715aa 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE # ----------- Unix --------------------------------------------------------- .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" diff --git a/curl/makefile.mk b/curl/makefile.mk index 1fab0c301bff..f0d225cc493a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -65,10 +65,6 @@ curl_CFLAGS+=-I$(SYSBASE)$/usr$/include curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)$(CPU)"=="LINUXGCCI" -curl_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - .IF "$(OS)$(CPU)"=="SOLARISU" curl_CFLAGS+:=$(ARCH_FLAGS) curl_LDFLAGS+:=$(ARCH_FLAGS) diff --git a/icu/makefile.mk b/icu/makefile.mk index 70ff42c1a443..ee82ad48a9ec 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -78,11 +78,6 @@ CC:=gcc $(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -# Disable executable stack -.IF "$(OS)$(COM)"=="LINUXGCC" -icu_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) icu_LDFLAGS+=$(EXTRA_LINKFLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS) diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 93275b65b2d8..70796380c3d9 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -87,10 +87,6 @@ xml2_CFLAGS+=$(ARCH_FLAGS) $(C_RESTRICTIONFLAGS) xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)"=="LINUXGCC" -xml2_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - CONFIGURE_DIR= .IF "$(OS)"=="OS2" CONFIGURE_ACTION=sh .$/configure diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index b3f9ed203653..f7494022c980 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -87,7 +87,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ELSE .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/python/makefile.mk b/python/makefile.mk index 86d9835e8604..a6b73d04cc5d 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -66,10 +66,6 @@ CC+:=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF # "$(SYSBASE)"!="" -.IF "$(OS)$(COM)"=="LINUXGCC" -python_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - .IF "$(OS)$(CPU)"=="SOLARISU" CC+:=$(ARCH_FLAGS) python_LDFLAGS+=$(ARCH_FLAGS) -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit -- cgit From 4b2e694152106ac0ed6f8142ad77b8da74d82c79 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 8 Oct 2010 16:12:40 +0200 Subject: ause126: #i114866# applied patch from issue: fix parallel build issue --- python/Python-parallel-make.patch | 36 ++++++++++++++++++++++++++++++++++++ python/makefile.mk | 1 + 2 files changed, 37 insertions(+) create mode 100644 python/Python-parallel-make.patch diff --git a/python/Python-parallel-make.patch b/python/Python-parallel-make.patch new file mode 100644 index 000000000000..81ce8dabe35b --- /dev/null +++ b/python/Python-parallel-make.patch @@ -0,0 +1,36 @@ +--- misc/Python-2.6.1/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400 ++++ misc/build/Python-2.6.1/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400 +@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@ + + ########################################################################## + # Grammar ++GRAMMAR_STAMP= $(srcdir)/grammar-stamp + GRAMMAR_H= $(srcdir)/Include/graminit.h + GRAMMAR_C= $(srcdir)/Python/graminit.c + GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar +@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get + Modules/python.o: $(srcdir)/Modules/python.c + $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c + ++# GNU "make" interprets rules with two dependents as two copies of the rule. ++# ++# In a parallel build this can lead to pgen being run twice, once for each of ++# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler ++# reads a partially-overwritten copy of one of these files, leading to syntax ++# errors (or linker errors if the fragment happens to be syntactically valid C) ++# ++# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html ++# for more information ++# ++# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid ++# this: ++$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) + +-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) ++$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) + -@$(INSTALL) -d Include + -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ touch $(GRAMMAR_STAMP) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) diff --git a/python/makefile.mk b/python/makefile.mk index 5caa7ac1d601..607ba93ab92d 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -49,6 +49,7 @@ TARFILE_NAME=Python-$(PYVERSION) TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ + Python-parallel-make.patch \ Python-ssl.patch CONFIGURE_DIR= -- cgit From 05986a18a9739bc6e2022d677f6334c546aade10 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 12 Oct 2010 11:20:40 +0200 Subject: ause126: #i115018# extend PATH for build action only --- nss/makefile.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nss/makefile.mk b/nss/makefile.mk index 22b126a43c57..34e278c4d84c 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -136,8 +136,6 @@ OUT2LIB= \ MOZ_MSVCVERSION= 9 .EXPORT : MOZ_MSVCVERSION moz_build:=$(shell cygpath -p $(MOZILLABUILD)) -PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) -.EXPORT : PATH #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll #become libnspr4.dll, libplc4.dll, libplds4.dll @@ -152,7 +150,7 @@ EXT_USE_STLPORT=TRUE #To build nss one has to call "make nss_build_all" in #mozilla/security/nss NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) -BUILD_ACTION= $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ +BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ -c "cd $(NSS_BUILD_DIR) && make nss_build_all" OUT2LIB= \ -- cgit