Skip to contentSkip to conversation

package/fetchmail: use pkg-config to find openssl

PATCH New Fabrice Fontaine 3 participants 3 messages Mar 22, 2019 – Mar 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/fetchmail: use pkg-config to find openssl

openssl can have multiples dependencies such as libatomic on sparcv8 32 bits so drop first patch and add a new patch to use pkg-config

Fixes:
- http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4

---
 ...ressl.patch => 0001-enable-libressl.patch} |  0
 .../0001-fix-openssl-static-link.patch        | 30 --------
 ...re.ac-use-pkg-config-to-find-openssl.patch | 69 +++++++++++++++++++
 package/fetchmail/fetchmail.mk                |  7 +-
 4 files changed, 70 insertions(+), 36 deletions(-)
 rename package/fetchmail/{0002-enable-libressl.patch => 0001-enable-libressl.patch} (100%)
 delete mode 100644 package/fetchmail/0001-fix-openssl-static-link.patch
 create mode 100644 package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch
package/fetchmail/0001-enable-libressl.patch renamed from package/fetchmail/0002-enable-libressl.patch +0 -0
similarity index 100%
rename from package/fetchmail/0002-enable-libressl.patch
rename to package/fetchmail/0001-enable-libressl.patch
package/fetchmail/0001-fix-openssl-static-link.patch deleted +0 -30
deleted file mode 100644
index 1a5f4d6f71..0000000000
@@ -1,30 +0,0 @@
-Fix checking for statically build OpenSSL with libz dependency
-
-Fixes
-http://autobuild.buildroot.net/results/48a/48ad6d3659cf1f04581b7e3d115bebf454ff17fd/
-
-configure: Enabling OpenSSL support in /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr.
-checking for additional library dependencies of SSL... error
-configure: error: cannot link with SSL - check config.log
-
-In config.log multiple linking errors to libz can be found:
-
-configure:10099: /home/br/br/output/host/usr/bin/i486-ctng-linux-uclibc-gcc -o
-  conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64
-  /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(c_zlib.o):
-  In function `zlib_stateful_c_zlib.c:(.text+0x56): undefined reference to `inflate'
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -uNr fetchmail-6.3.26.org/configure.ac fetchmail-6.3.26/configure.ac
---- fetchmail-6.3.26.org/configure.ac	2013-04-23 22:51:10.000000000 +0200
-+++ fetchmail-6.3.26/configure.ac	2014-07-27 09:20:25.000000000 +0200
-@@ -778,7 +778,7 @@
-     AC_MSG_ERROR([SSL support enabled, but OpenSSL not found])
-   fi
-   LDFLAGS="$LDFLAGS -L$with_ssl/lib"
--  LIBS="$LIBS -lssl -lcrypto"
-+  LIBS="-lssl -lcrypto $LIBS"
-   dnl check if -ldl is needed
-   AC_MSG_CHECKING([for additional library dependencies of SSL])
-   found=0
package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch new file +69 -0

69 lines not on this page · raw message

package/fetchmail/fetchmail.mk +1 -6
index 37bbeabf62..41505e8637 100644
@@ -13,17 +13,12 @@ FETCHMAIL_LICENSE_FILES = COPYING
 FETCHMAIL_AUTORECONF = YES
 FETCHMAIL_GETTEXTIZE = YES
 
-# needed to help fetchmail detecting the availability of openssl,
-# because it doesn't use pkg-config
-ifeq ($(BR2_STATIC_LIBS),y)
-FETCHMAIL_CONF_ENV += LIBS="-lz"
-endif
-
 FETCHMAIL_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr
 
 FETCHMAIL_DEPENDENCIES = \
 	ca-certificates \
+	host-pkgconf \
 	openssl \
 	$(TARGET_NLS_DEPENDENCIES)
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/fetchmail: use pkg-config to find openssl

Hello Fabrice,

Quoted 7 lines · On Fri, 22 Mar 2019 21:34:59 +0100 Fabrice Fontaine…

openssl can have multiples dependencies such as libatomic on sparcv8 32 bits so drop first patch and add a new patch to use pkg-config

Fixes:
- http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4

Quoted 9 lines
---
 ...ressl.patch => 0001-enable-libressl.patch} |  0
 .../0001-fix-openssl-static-link.patch        | 30 --------
 ...re.ac-use-pkg-config-to-find-openssl.patch | 69 +++++++++++++++++++
 package/fetchmail/fetchmail.mk                |  7 +-
 4 files changed, 70 insertions(+), 36 deletions(-)
 rename package/fetchmail/{0002-enable-libressl.patch => 0001-enable-libressl.patch} (100%)
 delete mode 100644 package/fetchmail/0001-fix-openssl-static-link.patch
 create mode 100644 package/fetchmail/0002-configure.ac-use-pkg-config-to-find-openssl.patch

Applied to master, thanks. Really great to see this effort towards using pkg-config in more packages, and great as well to see that you have already submitted this patch for upstream inclusion. Keep up the good work!

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/fetchmail: use pkg-config to find openssl

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

openssl can have multiples dependencies such as libatomic on sparcv8 32 bits so drop first patch and add a new patch to use pkg-config

Fixes:
- http://autobuild.buildroot.org/results/58e5aa7c6ba8fe7474071d7a3cba6ed3a1b4cff4

Committed to 2018.02.x, 2018.11.x and 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard