diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-27 12:53:29 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-04-27 12:54:42 +0200 |
| commit | 7360377c4476bd2a659fe806f99b280854f60328 (patch) | |
| tree | 1f897936df97748a87cb835be02f6908786cd7a0 /patches | |
| parent | fd6cf78ab0a6d70320d05f895aaae6e38e39da32 (diff) | |
| download | ptxdist-7360377c4476bd2a659fe806f99b280854f60328.tar.gz ptxdist-7360377c4476bd2a659fe806f99b280854f60328.tar.xz | |
openssl: fix & improve parallel building
There was another missing dependency. Also, use the jobserver when
possible.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/openssl-1.0.1m/0101-fix-parallel-building.patch | 65 |
1 files changed, 53 insertions, 12 deletions
diff --git a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch b/patches/openssl-1.0.1m/0101-fix-parallel-building.patch index 467fc1b56..83374f603 100644 --- a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch +++ b/patches/openssl-1.0.1m/0101-fix-parallel-building.patch @@ -4,25 +4,66 @@ Subject: [PATCH] fix parallel building Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - Makefile.org | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Makefile.org | 20 ++++++++++---------- + crypto/Makefile | 2 +- + engines/Makefile | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.org b/Makefile.org -index 5117a0ef9c0b..49454d6cb899 100644 +index 5117a0ef9c0b..7f62a594fb27 100644 --- a/Makefile.org +++ b/Makefile.org -@@ -278,11 +278,11 @@ build_ssl: - @dir=ssl; target=all; $(BUILD_ONE_CMD) - build_engines: - @dir=engines; target=all; $(BUILD_ONE_CMD) +@@ -273,17 +273,17 @@ build_all: build_libs build_apps build_tests build_tools + build_libs: build_crypto build_ssl build_engines + + build_crypto: +- @dir=crypto; target=all; $(BUILD_ONE_CMD) ++ @+dir=crypto; target=all; $(BUILD_ONE_CMD) + build_ssl: +- @dir=ssl; target=all; $(BUILD_ONE_CMD) +-build_engines: +- @dir=engines; target=all; $(BUILD_ONE_CMD) -build_apps: -+build_apps: build_libs - @dir=apps; target=all; $(BUILD_ONE_CMD) +- @dir=apps; target=all; $(BUILD_ONE_CMD) -build_tests: -+build_tests: build_libs - @dir=test; target=all; $(BUILD_ONE_CMD) +- @dir=test; target=all; $(BUILD_ONE_CMD) -build_tools: +- @dir=tools; target=all; $(BUILD_ONE_CMD) ++ @+dir=ssl; target=all; $(BUILD_ONE_CMD) ++build_engines: build_crypto ++ @+dir=engines; target=all; $(BUILD_ONE_CMD) ++build_apps: build_libs ++ @+dir=apps; target=all; $(BUILD_ONE_CMD) ++build_tests: build_libs ++ @+dir=test; target=all; $(BUILD_ONE_CMD) +build_tools: build_libs - @dir=tools; target=all; $(BUILD_ONE_CMD) ++ @+dir=tools; target=all; $(BUILD_ONE_CMD) all_testapps: build_libs build_testapps + build_testapps: +diff --git a/crypto/Makefile b/crypto/Makefile +index 2355661f40fa..5af752afd45c 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -85,7 +85,7 @@ testapps: + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + + subdirs: +- @target=all; $(RECURSIVE_MAKE) ++ @+target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO +diff --git a/engines/Makefile b/engines/Makefile +index 58e028131786..34fbc27ebd14 100644 +--- a/engines/Makefile ++++ b/engines/Makefile +@@ -89,7 +89,7 @@ lib: $(LIBOBJ) + + subdirs: + echo $(EDIRS) +- @target=all; $(RECURSIVE_MAKE) ++ @+target=all; $(RECURSIVE_MAKE) + + files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |