[openwrt/openwrt] openssl: passing cflags to configure

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 17 03:58:08 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/70e3f4e94dd7687533d4092991eb3ddfae2a2380

commit 70e3f4e94dd7687533d4092991eb3ddfae2a2380
Author: Jitao Lu <dianlujitao at gmail.com>
AuthorDate: Wed Jun 14 17:25:03 2023 +0800

    openssl: passing cflags to configure
    
    openssl sets additional cflags in its configuration script. We need to
    make it aware of our custom cflags to avoid adding conflicting cflags.
    
    Fixes: #12866
    Signed-off-by: Jitao Lu <dianlujitao at gmail.com>
    (cherry picked from commit 51f57e7c2dd2799e34036ec74b3436bf490fade0)
---
 package/libs/openssl/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index d25f1aba6c..fa359b7e1a 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=openssl
 PKG_BASE:=1.1.1
 PKG_BUGFIX:=u
 PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_BUILD_PARALLEL:=1
@@ -332,6 +332,7 @@ define Build/Configure
 			--libdir=lib \
 			--openssldir=/etc/ssl \
 			--cross-compile-prefix="$(TARGET_CROSS)" \
+			$(TARGET_CFLAGS) \
 			$(TARGET_CPPFLAGS) \
 			$(TARGET_LDFLAGS) \
 			$(OPENSSL_OPTIONS) && \




More information about the lede-commits mailing list