[PATCH openbmc 4/7] openssl: run 'make depend'

OpenBMC Patches openbmc-patches at stwcx.xyz
Tue Jun 21 07:57:34 AEST 2016


From: Patrick Williams <patrick at stwcx.xyz>

The configure flags we have require openssl to be built with:
    make depend && make
The current openssl.inc file only has 'make', so prepend a call
to 'make depend'.

Signed-off-by: Patrick Williams <patrick at stwcx.xyz>
---
 .../recipes-connectivity/openssl/openssl/Configure.patch  | 15 +++++++++++++++
 .../recipes-connectivity/openssl/openssl_%.bbappend       |  8 ++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 meta-phosphor/common/recipes-connectivity/openssl/openssl/Configure.patch

diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl/Configure.patch b/meta-phosphor/common/recipes-connectivity/openssl/openssl/Configure.patch
new file mode 100644
index 0000000..690301b
--- /dev/null
+++ b/meta-phosphor/common/recipes-connectivity/openssl/openssl/Configure.patch
@@ -0,0 +1,15 @@
+diff --git a/Configure.bak b/Configure
+index c98107a..320cf2c 100755
+--- a/Configure.bak
++++ b/Configure
+@@ -1723,8 +1723,8 @@ while (<IN>)
+ 		s/^CC=.*$/CC= $cc/;
+ 		s/^AR=\s*ar/AR= $ar/;
+ 		s/^RANLIB=.*/RANLIB= $ranlib/;
+-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
++		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/; # if $cc eq "gcc";
++		#s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
+ 		}
+ 	s/^CFLAG=.*$/CFLAG= $cflags/;
+ 	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
index a18a552..ead4ec3 100644
--- a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
+++ b/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = "file://Configure.patch"
 
 # General config settings.
 EXTRA_OECONF_append = " shared no-hw no-err no-psk no-srp no-engines "
@@ -9,3 +11,9 @@ EXTRA_OECONF_append = " no-ssl2 no-ssl3 "
 EXTRA_OECONF_append = " no-idea no-md2 no-mdc2 no-rc5 no-md4 \
         no-ripemd160 no-rmd160 no-whirlpool no-sha0 no-camellia \
         no-rc2 no-rc4 no-bf no-cast no-seed no-gost "
+
+do_configure_append() {
+    pwd
+    cat Makefile
+    oe_runmake depend
+}
-- 
2.9.0




More information about the openbmc mailing list