libassuan: Improve pkgconfig support
PATCH 1/1 libassuan: Improve pkgconfig support
Add api_version and host to the .pc file and use pkg-config in the m4 macros for the package.
Signed-off-by Richard Purdie <[email protected]>
meta/recipes-support/libassuan/files/libassuan-add-pkgconfig-support.patch deleted +0 -57
@@ -1,57 +0,0 @@ -Add pkgconfig support to libassuan. -This patch is rejected by upstream for the reason below: -They think pkgconfig adds no portability and maintaining them is not worthwhile. - -Upstream-Status: Rejected -Signed-off-by: Chen Qi <[email protected]> -Signed-off-by: Constantin Musca <[email protected]> - -Index: libassuan-2.1.0/Makefile.am -=================================================================== ---- libassuan-2.1.0.orig/Makefile.am -+++ libassuan-2.1.0/Makefile.am -@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz - # (A suitable gitlog-to-changelog script can be found in GnuPG master.) - GITLOG_TO_CHANGELOG=gitlog-to-changelog - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = assuan.pc -+ - EXTRA_DIST = config.rpath autogen.sh README.GIT \ - ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \ - tests/ChangeLog-2011 contrib/ChangeLog-2011 \ -- build-aux/git-log-footer build-aux/git-log-fix -+ build-aux/git-log-footer build-aux/git-log-fix assuan.pc.in - - SUBDIRS = m4 src doc tests - -Index: libassuan-2.1.0/assuan.pc.in -=================================================================== ---- /dev/null -+++ libassuan-2.1.0/assuan.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libassuan -+Description: IPC library used by GnuPG and GPGME -+Requires: -+Version: @VERSION@ -+Libs: -L${libdir} -lassuan -+Libs.private: -lgpg-error -+Cflags: -I${includedir} -Index: libassuan-2.1.0/configure.ac -=================================================================== ---- libassuan-2.1.0.orig/configure.ac -+++ libassuan-2.1.0/configure.ac -@@ -433,7 +433,7 @@ AC_CONFIG_FILES([doc/Makefile]) - AC_CONFIG_FILES([tests/Makefile]) - AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) - AC_CONFIG_FILES([src/versioninfo.rc]) -- -+AC_CONFIG_FILES([assuan.pc]) - AC_OUTPUT - - echo "
meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch new file +158 -0
158 lines not on this page · raw message
meta/recipes-support/libassuan/libassuan_2.1.1.bb +5 -0
@@ -17,3 +17,8 @@ SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36" SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d" inherit autotools texinfo binconfig pkgconfig + +do_configure_prepend () { + # Else these could be used in prefernce to those in aclocal-copy + rm ${S}/m4/*.m4 +}