package/htpdate: fix build with static openssl
PATCH 1/1 package/htpdate: fix build with static openssl
Depending on its build configuration, openssl might not be compiled with dynamic zlib support, and programs that link against openssl need to link against zlib as well.
This can be generally and easily handled using the pkg-config files installed by openssl.
Signed-off-by Titouan Christophe <[email protected]>
--- ...-config-to-determine-openssl-LDFLAGS.patch | 36 +++++++++++++++++++ package/htpdate/htpdate.mk | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch
package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 32d6cec3be361c3d2228967d41b868b7b3b910c0 Mon Sep 17 00:00:00 2001 +From: Titouan Christophe <[email protected]> +Date: Sat, 12 Sep 2020 16:49:57 +0200 +Subject: [PATCH 1/1] Use pkg-config to determine openssl LDFLAGS + +Depending on its build configuration, openssl might not be compiled with +dynamic zlib support, and programs that link against openssl need to link +against zlib as well, as illustrated in this build failure: +http://autobuild.buildroot.net/results/ae9/ae946ca72238840b3eaa5fe823e8d620618f7462/ + +Signed-off-by: Titouan Christophe <[email protected]> +[upstream status: https://github.com/angeloc/htpdate/pull/1] +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 09eea4a..21668a6 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,10 +4,11 @@ mandir = ${prefix}/share/man + + CC ?= gcc + CFLAGS += -Wall -std=c99 -pedantic -O2 ++PKG_CONFIG ?= pkg-config + + ifdef ENABLE_HTTPS + CFLAGS += -DENABLE_HTTPS +-LDFLAGS += -lssl -lcrypto ++LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) + endif + + INSTALL = install -c +-- +2.25.3 +
package/htpdate/htpdate.mk +1 -1
@@ -11,7 +11,7 @@ HTPDATE_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) HTPDATE_BUILD_OPTS = ENABLE_HTTPS=1 -HTPDATE_DEPENDENCIES += openssl +HTPDATE_DEPENDENCIES += openssl host-pkgconf endif define HTPDATE_BUILD_CMDS
Signature · 1 line
2.25.3
Thomas Petazzoni
AppliedPATCH 1/1 package/htpdate: fix build with static openssl
Quoted 7 lines · On Sat, 12 Sep 2020 17:05:27 +0200 Titouan Christophe…
Depending on its build configuration, openssl might not be compiled with dynamic zlib support, and programs that link against openssl need to link against zlib as well.
This can be generally and easily handled using the pkg-config files installed by openssl.
Quoted 8 lines
Signed-off-by Titouan Christophe <[email protected]>--- ...-config-to-determine-openssl-LDFLAGS.patch | 36 +++++++++++++++++++ package/htpdate/htpdate.mk | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 package/htpdate/0001-Use-pkg-config-to-determine-openssl-LDFLAGS.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com