[openwrt/openwrt] openssl: tell the build system that we are doing CROSS_COMPILE

LEDE Commits lede-commits at lists.infradead.org
Fri Jan 26 02:27:24 PST 2018


yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/2c50af0cea14edad1b84725af273fdb1160a3b9f

commit 2c50af0cea14edad1b84725af273fdb1160a3b9f
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Fri Jan 26 18:13:21 2018 +0800

    openssl: tell the build system that we are doing CROSS_COMPILE
    
    So that it will not try to run c_rehash with the just built binaries on
    certs/demo.
    
    Fixes openwrt/packages#5432
    
    Reported-by: Val Kulkov <val.kulkov at gmail.com>
    Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 package/libs/openssl/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index b75aa45..9c4a39e 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -198,6 +198,7 @@ define Build/Configure
 	# so remove installed stuff first
 	-$(SUBMAKE) -j1 clean-staging
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		MAKEDEPPROG="$(TARGET_CROSS)gcc" \
 		OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
 		$(OPENSSL_MAKEFLAGS) \
@@ -209,6 +210,7 @@ TARGET_LDFLAGS += -Wl,--gc-sections
 
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \
 		AR="$(TARGET_CROSS)ar r" \
@@ -217,6 +219,7 @@ define Build/Compile
 		$(OPENSSL_MAKEFLAGS) \
 		all
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \
 		AR="$(TARGET_CROSS)ar r" \
@@ -227,11 +230,13 @@ define Build/Compile
 	# Work around openssl build bug to link libssl.so with libcrypto.so.
 	-rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
 		$(OPENSSL_MAKEFLAGS) \
 		do_linux-shared
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
 		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
 		$(OPENSSL_MAKEFLAGS) \



More information about the lede-commits mailing list