From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@buildroot.org
Subject: [Buildroot] [git commit branch/2022.05.x] package/libopenssl: fix BR2_OPTIMIZE_FAST build
Date: Thu, 11 Aug 2022 13:41:44 +0200 [thread overview]
Message-ID: <20220811112945.C24AE8712A@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=bb5c40b896135be524c80b52860aa43cc4604fb2
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.05.x
Drop unneeded SED hacks (including build_tests) to fix the following
build failure with BR2_OPTIMIZE_FAST:
In file included from crypto/async/arch/../async_local.h:30,
from crypto/async/arch/async_null.c:11:
crypto/async/arch/../arch/async_posix.h:32:5: error: unknown type name 'ucontext_t'
32 | ucontext_t fibre;
| ^~~~~~~~~~
While at it, also "drop parentheses as all it does is spawn a useless
sub-shell" as noticed by Yann E. Morin
Fixes:
- http://autobuild.buildroot.org/results/3ce202f11a821940ff55eafa1dc7cea54b8c0da2
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit a7c4f8e485abb91683268eb4fe543a9e882f0552)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/libopenssl/libopenssl.mk | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk
index 135129d47f..c7a2d65cc4 100644
--- a/package/libopenssl/libopenssl.mk
+++ b/package/libopenssl/libopenssl.mk
@@ -52,7 +52,7 @@ LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
endif
define HOST_LIBOPENSSL_CONFIGURE_CMDS
- (cd $(@D); \
+ cd $(@D); \
$(HOST_CONFIGURE_OPTS) \
./config \
--prefix=$(HOST_DIR) \
@@ -61,15 +61,14 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS
no-fuzz-libfuzzer \
no-fuzz-afl \
shared \
- zlib-dynamic \
- )
- $(SED) "s#-O[0-9sg]#$(HOST_CFLAGS)#" $(@D)/Makefile
+ zlib-dynamic
endef
define LIBOPENSSL_CONFIGURE_CMDS
- (cd $(@D); \
+ cd $(@D); \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(LIBOPENSSL_CFLAGS)" \
./Configure \
$(LIBOPENSSL_TARGET_ARCH) \
--prefix=/usr \
@@ -108,11 +107,7 @@ define LIBOPENSSL_CONFIGURE_CMDS
$(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \
$(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \
$(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
- $(if $(BR2_STATIC_LIBS),no-dso) \
- )
- $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile
- $(SED) "s#-O[0-9sg]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile
- $(SED) "s# build_tests##" $(@D)/Makefile
+ $(if $(BR2_STATIC_LIBS),no-dso)
endef
# libdl is not available in a static build, and this is not implied by no-dso
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
reply other threads:[~2022-08-11 11:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220811112945.C24AE8712A@busybox.osuosl.org \
--to=peter@korsgaard.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.