From 6101bd9564d6334dea7c0de778536e3fe1a5e9b9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 9 Feb 2015 15:38:59 +0100 Subject: Description: Enable parallel make (031_nx-X11_parallel-make.full.patch). Restore ability to build things in parallel. (${MAKE} must always appear in the rule directly, and not be hidden through expansions of other variables to get this to work.) --- debian/patches/031_nx-X11_parallel-make.full.patch | 200 --------------------- debian/patches/series | 1 - 2 files changed, 201 deletions(-) delete mode 100644 debian/patches/031_nx-X11_parallel-make.full.patch (limited to 'debian') diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch deleted file mode 100644 index 496020545..000000000 --- a/debian/patches/031_nx-X11_parallel-make.full.patch +++ /dev/null @@ -1,200 +0,0 @@ -Description: Enable parallel make - Restore ability to build things in parallel. - (${MAKE} must always appear in the rule directly, and not be - hidden through expansions of other variables to get this to work.) -Forward: pending -Author: Jan Engelhardt -Last-Update: 2012-01-26 22:29:13.993994227 +0100 - ---- - nx-X11/Makefile | 64 +++++++++++++++++----------------- - nx-X11/config/imake/Makefile.ini | 1 - nx-X11/lib/X11/Imakefile | 12 ++---- - nx-X11/programs/Xserver/Imakefile | 4 +- - 10 files changed, 60 insertions(+), 69 deletions(-) - ---- a/nx-X11/Makefile -+++ b/nx-X11/Makefile -@@ -32,8 +32,8 @@ - VERSPROG = $(CONFIGSRC)/util/printver.exe - - all: -- @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial -- @$(MAKE_CMD) $@ -+ @${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial -+ @${MAKE} ${MAKE_OPTS} $@ - - all-initial: - @echo Please use make World, or on NT use nmake World.Win32. -@@ -57,8 +57,8 @@ - @date - @echo "" - @if [ -f xmakefile ]; then \ -- $(MAKE_CMD) -k distclean || \ -- $(MAKE_CMD) -k clean || \ -+ ${MAKE} ${MAKE_OPTS} -k distclean || \ -+ ${MAKE} ${MAKE_OPTS} -k clean || \ - $(RM) xmakefile; \ - fi - @if [ ! -f $(IRULESRC)/host.def ]; then \ -@@ -84,14 +84,14 @@ - # fi - cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean - $(MAKE) $(MFLAGS) Makefile.boot -- $(MAKE_CMD) $(MFLAGS) version.def -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def - $(MAKE) $(MFLAGS) Makefile.boot -- $(MAKE_CMD) $(MFLAGS) VerifyOS -- $(MAKE_CMD) $(MFLAGS) Makefiles -- $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean -- $(MAKE_CMD) $(MFLAGS) includes -- $(MAKE_CMD) $(MFLAGS) depend -- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World - @echo "" - @date - @echo "" -@@ -154,15 +154,15 @@ - -if exist xmakefile.bak del xmakefile.bak - -if exist xmakefile ren xmakefile xmakefile.bak - $(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -- $(MAKE_CMD) $(MFLAGS) VerifyOS -- $(MAKE_CMD) $(MFLAGS) Makefiles -- $(MAKE_CMD) $(MFLAGS) clean -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) clean - cd $(CONFIGSRC)\util - $(MAKE) mkdirhier.exe - cd ..\.. -- $(MAKE_CMD) $(MFLAGS) includes -- $(MAKE_CMD) $(MFLAGS) depend -- $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS) -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) includes -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) depend -+ ${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS) - @echo : - @echo : - @echo Full build of $(RELEASE) complete. -@@ -198,38 +198,38 @@ - # a copy of every rule that might be invoked at top level - - clean: -- -$(MAKE_CMD) $@ -+ -${MAKE_CMD} ${MAKE_OPTS} $@ - find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done - rm -f config/cf/{version.def,date.def} - dangerous_strip_clean: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - distclean: -- -$(MAKE_CMD) $@ -+ -${MAKE} ${MAKE_OPTS} $@ - $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def - depend: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - Everything: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - external.ln: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - includes: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.sdk: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.ln: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install.man: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - install: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - Makefiles: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - man_keywords: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - tags: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ - VerifyOS: -- $(MAKE_CMD) $@ -+ ${MAKE} ${MAKE_OPTS} $@ ---- a/nx-X11/config/imake/Makefile.ini -+++ b/nx-X11/config/imake/Makefile.ini -@@ -21,7 +21,6 @@ - SHELL = /bin/sh - RM = rm -f - MV = mv --MAKE = make - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \ - tags TAGS make.log - NPROC = 1 ---- a/nx-X11/lib/X11/Imakefile -+++ b/nx-X11/lib/X11/Imakefile -@@ -1161,25 +1161,23 @@ - - #ifdef SunArchitecture - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- gmake -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - - $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- gmake -+ ${MAKE} -C ../../../nxcompext - - #else - $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) -- cd $(NX_XCOMPLIBDIR) && \ -- make -+ ${MAKE} -C $(NX_XCOMPLIBDIR) - --$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) -- cd ../../../nxcompext && \ -- make -+$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV) -+ ${MAKE} -C ../../../nxcompext - - #endif - --depend:: $(NX_XCOMPLIBTARGET) -+depend:: -+ -+lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET) - - all:: $(NX_XCOMPLIBTARGET) - ---- a/nx-X11/programs/Xserver/Imakefile -+++ b/nx-X11/programs/Xserver/Imakefile -@@ -1045,11 +1045,11 @@ - #ifdef SunArchitecture - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- gmake -+ ${MAKE} - #else - $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET) - cd $(NX_XSHADOWLIBDIR) && \ -- rm -f *.o && make -+ rm -f *.o && ${MAKE} - #endif - - ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \ - diff --git a/debian/patches/series b/debian/patches/series index 1288ab3f4..2c9811e29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -031_nx-X11_parallel-make.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch 052_nxcomp_macos10-nxauth-location.full+lite.patch 053_nx-X11_no-xcomp1-install-target.full.patch -- cgit v1.2.3