Skip to contentSkip to conversation

Fix parallel make for openssl

PATCH In review Qing He 5 participants 6 messages Feb 17, 2011 – Feb 22, 2011

lore
Share & tools
lore

Qing He

author
#0 lore raw

cover Fix parallel make for openssl

From: Qing He <[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He <[email protected]>
---

Qing He (1):
openssl: fix parallel make

 .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18 ++++++++++++++++++
 meta/recipes-connectivity/openssl/openssl.inc      |    6 +++---
 .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
author
#1 lore raw

PATCH 1/1 openssl: fix parallel make

From: Qing He <[email protected]>

Signed-off-by Qing He <[email protected]>
---
 .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18 ++++++++++++++++++
 meta/recipes-connectivity/openssl/openssl.inc      |    6 +++---
 .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch new file +18 -0
new file mode 100644
index 0000000..60fab9d
@@ -0,0 +1,18 @@
+fix the parallel build regarding shared libraries.
+
+Signed-off-by: Qing He <[email protected]>
+
+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 \
meta/recipes-connectivity/openssl/openssl.inc +3 -3
index f054c26..68b3d7b 100644
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
 
 DEPENDS = "perl-native"
 
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+           file://parallel-make-fix.patch \
+          "
 S = "${WORKDIR}/openssl-${PV}"
 
 AR_append = " r"

@@ -29,8 +31,6 @@ export DIRS = "crypto ssl apps"
 export EX_LIBS = "-lgcc -ldl"
 export AS = "${CC} -c"
 
-PARALLEL_MAKE = ""
-
 inherit pkgconfig siteinfo
 
 PACKAGES =+ "libcrypto libssl"
meta/recipes-connectivity/openssl/openssl_0.9.8p.bb +1 -1
index 283b82a..f42b3cb 100644
@@ -1,6 +1,6 @@
 require openssl.inc
 
-PR = "r2"
+PR = "r3"
 SRC_URI += "file://debian/ca.patch \
             file://debian/config-hurd.patch;apply=no \
             file://debian/debian-targets.patch \
Signature · 1 line
1.7.0
#2 lore raw

Re: [PATCH 1/1] openssl: fix parallel make

Quoted 1 line · Qing He

From: Qing He<[email protected]>

I've noticed we have a lot of patches in our sources that have single line commit logs. It takes a little more time to create an explanatory message, but it saves everyone who looks at it more time. If understand this one correctly, it should read something like:

-----
openssl: fix parallel make

The current makefile doesn't explicitly list certain dependencies which result in a build failure with parallel make.
-----

However, I don't see how the new build_testapps target impacts this.

Thanks,

Darren

Quoted 69 lines
Signed-off-by Qing He<[email protected]>
---
  .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18 ++++++++++++++++++
  meta/recipes-connectivity/openssl/openssl.inc      |    6 +++---
  .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-
  3 files changed, 22 insertions(+), 4 deletions(-)

create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch

meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch new file +18 -0
new file mode 100644
index 0000000..60fab9d
@@ -0,0 +1,18 @@
+fix the parallel build regarding shared libraries.
+
+Signed-off-by: Qing He<[email protected]>
+
+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 \
meta/recipes-connectivity/openssl/openssl.inc +3 -3
index f054c26..68b3d7b 100644
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
 
  DEPENDS = "perl-native"
 
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+           file://parallel-make-fix.patch \
+          "
  S = "${WORKDIR}/openssl-${PV}"
 
  AR_append = " r"

@@ -29,8 +31,6 @@ export DIRS = "crypto ssl apps"
  export EX_LIBS = "-lgcc -ldl"
  export AS = "${CC} -c"
 
-PARALLEL_MAKE = ""
-
  inherit pkgconfig siteinfo
 
  PACKAGES =+ "libcrypto libssl"
meta/recipes-connectivity/openssl/openssl_0.9.8p.bb +1 -1
index 283b82a..f42b3cb 100644
@@ -1,6 +1,6 @@
  require openssl.inc
 
-PR = "r2"
+PR = "r3"
  SRC_URI += "file://debian/ca.patch \
              file://debian/config-hurd.patch;apply=no \
              file://debian/debian-targets.patch \
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#3 lore raw
In reply to Qing He
Quoted 11 lines · Qing He

From: Qing He<[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He<[email protected]>
---

Quoted 8 lines

Qing He (1):
openssl: fix parallel make

  .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18 ++++++++++++++++++
  meta/recipes-connectivity/openssl/openssl.inc      |    6 +++---
  .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-
  3 files changed, 22 insertions(+), 4 deletions(-)

create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch

While in there, shouldn't we update to either 0.9.8r or 1.0.0d, for security fixes?

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#4 lore raw
Quoted 24 lines · Tom Rini
Quoted 15 lines · Qing He

From: Qing He<[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: qhe/fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
    Qing He<[email protected]>
---

Qing He (1):
  openssl: fix parallel make

Quoted 7 lines

 .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18
++++++++++++++++++
 meta/recipes-connectivity/openssl/openssl.inc      |    6 +++--- .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-

 3 files changed, 22 insertions(+), 4 deletions(-)

 create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch

Quoted 2 lines

While in there, shouldn't we update to either 0.9.8r or 1.0.0d, for security fixes?

1.0.0 is a big jump and you need a proper upgrade path if that matters see OE discussions from last year on it.

Quoted 9 lines

--
Tom Rini
Mentor Graphics Corporation
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

#5 lore raw
In reply to Qing He
Quoted 18 lines · Qing He

From: Qing He<[email protected]>

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He<[email protected]>
---

Qing He (1):
openssl: fix parallel make

  .../openssl/openssl-0.9.8p/parallel-make-fix.patch |   18 ++++++++++++++++++
  meta/recipes-connectivity/openssl/openssl.inc      |    6 +++---
  .../recipes-connectivity/openssl/openssl_0.9.8p.bb |    2 +-
  3 files changed, 22 insertions(+), 4 deletions(-)
Quoted 7 lines

create mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Parallel make change merged into Master

Thanks
Sau!