openssl: fully fix parallel builds

Add a patch from oe-core to fix parallel builds in openssl 0.9.8m.
Then drop PARALLEL_MAKE settings in both of recipes.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
lumag
2011-09-05 01:37:03 +00:00
committed by Koen Kooi
parent c17fe9bc7e
commit cffa06f750
3 changed files with 21 additions and 3 deletions
@@ -0,0 +1,20 @@
Upstream-Status: Submitted
fix the parallel build regarding shared libraries.
Signed-off-by: Qing He <qing.he@intel.com>
diff --git a/Makefile.org b/Makefile.org
index 2fb0309..8bec3d0 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
build_testapps:
@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
+libcrypto.a: build_crypto
+libssl.a: build_ssl
+
build_shared: $(SHARED_LIBS)
libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
@if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -11,6 +11,5 @@ export OE_LDFLAGS="${LDFLAGS}"
SRC_URI += "file://configure-targets.patch \ SRC_URI += "file://configure-targets.patch \
file://shared-libs.patch \ file://shared-libs.patch \
file://debian.patch \ file://debian.patch \
file://parallel-make-fix.patch \
file://oe-ldflags.patch" file://oe-ldflags.patch"
PARALLEL_MAKE = ""
@@ -41,6 +41,5 @@ PACKAGES += " \
${PN}-engines-dbg \ ${PN}-engines-dbg \
" "
PARALLEL_MAKE = ""
FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so"
FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"