[oe] [meta-oe 1/2] openssl: fully fix parallel builds

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thanks, both patches are in now

Op 04-09-11 19:37, Dmitry Eremin-Solenikov schreef:
> 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 at gmail.com> --- 
> .../openssl/openssl-0.9.8m/parallel-make-fix.patch |   20
> ++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_0.9.8m.bb |
> 3 +-- .../recipes-connectivity/openssl/openssl_1.0.0d.bb |    1 - 3 files
> changed, 21 insertions(+), 3 deletions(-) create mode 100644
> meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/parallel-make-fix.patch
>
>  diff --git
> a/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/parallel-make-fix.patch
> b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/parallel-make-fix.patch
>
> 
new file mode 100644
> index 0000000..82857f5 --- /dev/null +++
> b/meta-oe/recipes-connectivity/openssl/openssl-0.9.8m/parallel-make-fix.patch
>
> 
@@ -0,0 +1,20 @@
> +Upstream-Status: Submitted + +fix the parallel build regarding shared
> libraries. + +Signed-off-by: Qing He <qing.he at 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 \ diff --git
> a/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb
> b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb index
> a7eb332..1091bf2 100644 ---
> a/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb +++
> b/meta-oe/recipes-connectivity/openssl/openssl_0.9.8m.bb @@ -11,6 +11,5
> @@ export OE_LDFLAGS="${LDFLAGS}" SRC_URI +=
> "file://configure-targets.patch \ file://shared-libs.patch \ 
> file://debian.patch \ +            file://parallel-make-fix.patch \ 
> file://oe-ldflags.patch" - -PARALLEL_MAKE = "" diff --git
> a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
> b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb index
> 89b8615..63b5460 100644 ---
> a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb +++
> b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb @@ -41,6 +41,5
> @@ PACKAGES += " \ ${PN}-engines-dbg \ "
> 
> -PARALLEL_MAKE = "" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" 
> FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOZfVSMkyGM64RGpERAtSSAJ4nN/oPB3VVAXODFmpF4k71q+CodQCgh1wS
fqP96Q7HeUh4MeY8VeuaaP8=
=7dmp
-----END PGP SIGNATURE-----