diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-14 13:05:08 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-04-14 13:22:13 +0200 |
commit | a6b45be7d6f508f481303228197ca84dd5244c6d (patch) | |
tree | 55d119c6ef226cb34ed0b74ea7b049bda3f0c06b | |
parent | 40ed9688323e2695cb550b9a73879e8c50f9b193 (diff) | |
download | ptxdist-a6b45be7d6f508f481303228197ca84dd5244c6d.tar.gz ptxdist-a6b45be7d6f508f481303228197ca84dd5244c6d.tar.xz |
openssl: one more parallel building fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch | 2 | ||||
-rw-r--r-- | patches/openssl-1.0.2o/0101-fix-parallel-building.patch | 24 |
2 files changed, 22 insertions, 4 deletions
diff --git a/patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch index ce4420bc0..9c991be35 100644 --- a/patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch +++ b/patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch @@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configure b/Configure -index 74b2d4c109ab..0d719cfce83c 100755 +index dc23c869d557..b24208e5e12b 100755 --- a/Configure +++ b/Configure @@ -134,7 +134,7 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers diff --git a/patches/openssl-1.0.2o/0101-fix-parallel-building.patch b/patches/openssl-1.0.2o/0101-fix-parallel-building.patch index 71710fcf8..8daf03784 100644 --- a/patches/openssl-1.0.2o/0101-fix-parallel-building.patch +++ b/patches/openssl-1.0.2o/0101-fix-parallel-building.patch @@ -4,13 +4,13 @@ Subject: [PATCH] fix parallel building Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - Makefile.org | 18 ++++++++++++------ + Makefile.org | 22 ++++++++++++++-------- crypto/Makefile | 4 ++-- engines/Makefile | 4 ++-- - 3 files changed, 16 insertions(+), 10 deletions(-) + 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Makefile.org b/Makefile.org -index aec7e577e0bc..21235e04d7c6 100644 +index aec7e577e0bc..0b11edb0217f 100644 --- a/Makefile.org +++ b/Makefile.org @@ -281,18 +281,24 @@ build_libs: build_libcrypto build_libssl openssl.pc @@ -44,6 +44,24 @@ index aec7e577e0bc..21235e04d7c6 100644 all_testapps: build_libs build_testapps build_testapps: +@@ -311,7 +317,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT) + FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \ + export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \ + fi; \ +- $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared && \ ++ $(MAKE) -j1 -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared && \ + (touch -c fips_premain_dso$(EXE_EXT) || :); \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ +@@ -320,7 +326,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT) + + libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ ++ $(MAKE) -j1 SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ diff --git a/crypto/Makefile b/crypto/Makefile index 7869996a9c07..76690a1c8619 100644 --- a/crypto/Makefile |