package/gensio: add libgensio.pc
PATCH 1/2 package/gensio: add libgensio.pc
--- package/gensio/0002-Add-libgensio.pc.patch | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/gensio/0002-Add-libgensio.pc.patch
package/gensio/0002-Add-libgensio.pc.patch new file +73 -0
@@ -0,0 +1,73 @@ +From 4ac29c3d2c33b084214b05c568c68cfe4980939b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Wed, 12 Feb 2020 08:49:34 +0100 +Subject: [PATCH] Add libgensio.pc + +gensio can optionally depends on openssl so add libgensio.pc to allow +packages (such as ser2net) that link statically with gensio to use +pkg-config to retrieve those static dependencies + +For example, this will avoid the following build failure on ser2net: + +checking gensio/gensio.h usability... yes +checking gensio/gensio.h presence... yes +checking for gensio/gensio.h... yes +checking for str_to_gensio in -lgensio... no +configure: error: libgensio won't link, please install gensio dev package + +Fixes: + - http://autobuild.buildroot.org/results/f15cf961ddaf849987afce01ede0e3d1e77a0fc0 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/cminyard/gensio/pull/12] +--- + configure.ac | 1 + + lib/Makefile.am | 5 +++++ + lib/libgensio.pc.in | 10 ++++++++++ + 3 files changed, 16 insertions(+) + create mode 100644 lib/libgensio.pc.in + +diff --git a/configure.ac b/configure.ac +index 2f0221e..8cc8eff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -267,6 +267,7 @@ if test "x$enable_internal_trace" != xno; then + fi + + AC_OUTPUT([Makefile ++ lib/libgensio.pc + lib/Makefile + include/Makefile + include/gensio/Makefile +diff --git a/lib/Makefile.am b/lib/Makefile.am +index aacc618..d39b889 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -25,3 +25,8 @@ libgensio_la_SOURCES = \ + libgensio_la_LDFLAGS = $(OPENSSL_LIBS) + + EXTRA_DIST = README.rst ++ ++# This variable must have 'exec' in its name, in order to be installed ++# by 'install-exec' target (instead of default 'install-data') ++pkgconfigexecdir = $(libdir)/pkgconfig ++pkgconfigexec_DATA = libgensio.pc +diff --git a/lib/libgensio.pc.in b/lib/libgensio.pc.in +new file mode 100644 +index 0000000..23451a3 +--- /dev/null ++++ b/lib/libgensio.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libgensio ++Description: A library to abstract stream I/O like serial port, TCP, telnet, UDP, SSL, IPMI SOL, etc. ++Version: @VERSION@ ++Libs: -L${libdir} -lgensio ++Libs.private: @OPENSSL_LIBS@ +-- +2.24.1 +
Signature · 1 line
2.24.1
PATCH 2/2 package/ser2net: fix static build
Fixes:
- http://autobuild.buildroot.org/results/f15cf961ddaf849987afce01ede0e3d1e77a0fc0
--- ...-pkg-config-to-retrieve-gensio-depen.patch | 46 +++++++++++++++++++ package/ser2net/ser2net.mk | 2 + 2 files changed, 48 insertions(+) create mode 100644 package/ser2net/0001-configure.ac-use-pkg-config-to-retrieve-gensio-depen.patch
package/ser2net/0001-configure.ac-use-pkg-config-to-retrieve-gensio-depen.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 047f05862880f370b4ef3bf718557f18ac429787 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Wed, 12 Feb 2020 09:06:02 +0100 +Subject: [PATCH] configure.ac: use pkg-config to retrieve gensio dependencies + +gensio can optionally depends on openssl so use pkg-config to retrieve +those static dependencies thanks to libgensio.pc + +This will avoid the following build failure when building statically: + +checking gensio/gensio.h usability... yes +checking gensio/gensio.h presence... yes +checking for gensio/gensio.h... yes +checking for str_to_gensio in -lgensio... no +configure: error: libgensio won't link, please install gensio dev package + +Fixes: + - http://autobuild.buildroot.org/results/f15cf961ddaf849987afce01ede0e3d1e77a0fc0 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/cminyard/ser2net/commit/047f05862880f370b4ef3bf718557f18ac429787] +--- + configure.ac | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 011f9df..c5af1fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,10 +40,11 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_STDC_HEADERS + AC_CHECK_LIB(nsl,main) + +-AC_CHECK_HEADER(gensio/gensio.h, [], +- [AC_MSG_ERROR([gensio.h not found, please install gensio dev package])]) +-AC_CHECK_LIB(gensio, str_to_gensio, [], +- [AC_MSG_ERROR([libgensio won't link, please install gensio dev package])]) ++PKG_CHECK_MODULES(GENSIO, libgensio, [LIBS=$GENSIO_LIBS], ++ [AC_CHECK_HEADER(gensio/gensio.h, [], ++ [AC_MSG_ERROR([gensio.h not found, please install gensio dev package])]) ++ AC_CHECK_LIB(gensio, str_to_gensio, [], ++ [AC_MSG_ERROR([libgensio won't link, please install gensio dev package])])]) + + AC_CHECK_HEADER(yaml.h, [], + [AC_MSG_ERROR([yaml.h not found, please install libyaml dev package])])
package/ser2net/ser2net.mk +2 -0
@@ -9,6 +9,8 @@ SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING SER2NET_DEPENDENCIES = gensio libyaml +# We're patching configure.ac +SER2NET_AUTORECONF = YES ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) SER2NET_CONF_OPTS += --with-pthreads
Signature · 1 line
2.24.1
PATCH 1/2 package/gensio: add libgensio.pc
In reply to Fabrice FontaineHello Fabrice,
Quoted 5 lines · On Sun, 16 Feb 2020 21:02:41 +0100 Fabrice Fontaine…
Signed-off-by Fabrice Fontaine <[email protected]>--- package/gensio/0002-Add-libgensio.pc.patch | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/gensio/0002-Add-libgensio.pc.patch
So, your patch was merged in upstream gensio:
Which is now part of the 2.0.1 version of gensio that Buildroot is using.
However, upstream has applied another patch on top, which drops the Libs.private entry of your .pc.in:
In Buildroot, we have added a work-around to link against openssl in ser2net:
So, ideally this work-around should no longer be needed. And indeed, it does build fine without it. But how come it works since openssl is not in gensio.pc Libs.private ?
Could you have a look at this whole story ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com