mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libopenssl: fix BR2_OPTIMIZE_FAST build

Browse Source 
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>
This commit is contained in:
Fabrice Fontaine
2022-07-07 07:49:48 +02:00
committed by Thomas Petazzoni
parent 03022329e0
commit a7c4f8e485
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package/libopenssl/libopenssl.mk
View File

@@ -52,7 +52,7 @@ LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC
endif endif
define HOST_LIBOPENSSL_CONFIGURE_CMDS define HOST_LIBOPENSSL_CONFIGURE_CMDS
(cd $(@D); \ cd $(@D); \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
./config \ ./config \
--prefix=$(HOST_DIR) \ --prefix=$(HOST_DIR) \
@@ -61,15 +61,14 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS
no-fuzz-libfuzzer \ no-fuzz-libfuzzer \
no-fuzz-afl \ no-fuzz-afl \
shared \ shared \
zlib-dynamic \ zlib-dynamic
)
$(SED) "s#-O[0-9sg]#$(HOST_CFLAGS)#" $(@D)/Makefile
endef endef
define LIBOPENSSL_CONFIGURE_CMDS define LIBOPENSSL_CONFIGURE_CMDS
(cd $(@D); \ cd $(@D); \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(LIBOPENSSL_CFLAGS)" \
./Configure \ ./Configure \
$(LIBOPENSSL_TARGET_ARCH) \ $(LIBOPENSSL_TARGET_ARCH) \
--prefix=/usr \ --prefix=/usr \
@@ -108,11 +107,7 @@ define LIBOPENSSL_CONFIGURE_CMDS
$(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \ $(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \
$(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \
$(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
$(if $(BR2_STATIC_LIBS),no-dso) \ $(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
endef endef
# libdl is not available in a static build, and this is not implied by no-dso # libdl is not available in a static build, and this is not implied by no-dso