From 2e05d5a0362e2765fe6fb3444ada758dc5ef49f0 Mon Sep 17 00:00:00 2001 From: Jitao Lu Date: Wed, 14 Jun 2023 17:25:03 +0800 Subject: [PATCH] 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 (cherry picked from commit 51f57e7c2dd2799e34036ec74b3436bf490fade0) --- package/libs/openssl/Makefile | 3 ++- .../patches/106-Configure-fixup-for-octeon.patch | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 package/libs/openssl/patches/106-Configure-fixup-for-octeon.patch diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 9ccdb72d2a..bd3e18cf89 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 ENGINES_DIR=engines-1.1 @@ -338,6 +338,7 @@ define Build/Configure --libdir=lib \ --openssldir=/etc/ssl \ --cross-compile-prefix="$(TARGET_CROSS)" \ + $(TARGET_CFLAGS) \ $(TARGET_CPPFLAGS) \ $(TARGET_LDFLAGS) \ $(OPENSSL_OPTIONS) && \ diff --git a/package/libs/openssl/patches/106-Configure-fixup-for-octeon.patch b/package/libs/openssl/patches/106-Configure-fixup-for-octeon.patch deleted file mode 100644 index 3f46ff72ef..0000000000 --- a/package/libs/openssl/patches/106-Configure-fixup-for-octeon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Configure -+++ b/Configure -@@ -1244,7 +1244,7 @@ if ($target =~ /^mingw/ && `$config{CC} - } - - if ($target =~ /linux.*-mips/ && !$disabled{asm} -- && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { -+ && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { - # minimally required architecture flags for assembly modules - my $value; - $value = '-mips2' if ($target =~ /mips32/);