libassuan: Improve pkgconfig support
Add api_version and host to the .pc file and use pkg-config in the m4 macros for the package. (From OE-Core rev: 17e5793847601d2aeb497ffe14871df65543abfb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
55d0ae691d
commit
81bb1ab604
|
@ -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 <Qi.Chen@windriver.com>
|
||||
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
|
||||
|
||||
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 "
|
|
@ -0,0 +1,158 @@
|
|||
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 <Qi.Chen@windriver.com>
|
||||
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
|
||||
|
||||
Index: libassuan-2.1.1/Makefile.am
|
||||
===================================================================
|
||||
--- libassuan-2.1.1.orig/Makefile.am 2014-05-13 20:57:37.794398357 +0000
|
||||
+++ libassuan-2.1.1/Makefile.am 2014-05-13 20:57:37.790398357 +0000
|
||||
@@ -24,10 +24,13 @@
|
||||
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
|
||||
GITLOG_TO_CHANGELOG=gitlog-to-changelog
|
||||
|
||||
+pkgconfigdir = $(libdir)/pkgconfig
|
||||
+pkgconfig_DATA = libassuan.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 libassuan.pc.in
|
||||
|
||||
SUBDIRS = m4 src doc tests
|
||||
|
||||
Index: libassuan-2.1.1/libassuan.pc.in
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ libassuan-2.1.1/libassuan.pc.in 2014-05-13 20:57:37.790398357 +0000
|
||||
@@ -0,0 +1,14 @@
|
||||
+prefix=@prefix@
|
||||
+exec_prefix=@exec_prefix@
|
||||
+libdir=@libdir@
|
||||
+includedir=@includedir@
|
||||
+api_version=@LIBASSUAN_CONFIG_API_VERSION@
|
||||
+host=@LIBASSUAN_CONFIG_HOST@
|
||||
+
|
||||
+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.1/configure.ac
|
||||
===================================================================
|
||||
--- libassuan-2.1.1.orig/configure.ac 2014-05-13 20:57:37.794398357 +0000
|
||||
+++ libassuan-2.1.1/configure.ac 2014-05-13 20:57:37.790398357 +0000
|
||||
@@ -434,7 +434,7 @@
|
||||
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([libassuan.pc])
|
||||
AC_OUTPUT
|
||||
|
||||
echo "
|
||||
Index: libassuan-2.1.1/src/libassuan.m4
|
||||
===================================================================
|
||||
--- libassuan-2.1.1.orig/src/libassuan.m4 2011-04-06 15:37:26.000000000 +0000
|
||||
+++ libassuan-2.1.1/src/libassuan.m4 2014-05-13 21:06:53.402395537 +0000
|
||||
@@ -15,18 +15,6 @@
|
||||
dnl
|
||||
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
- AC_ARG_WITH(libassuan-prefix,
|
||||
- AC_HELP_STRING([--with-libassuan-prefix=PFX],
|
||||
- [prefix where LIBASSUAN is installed (optional)]),
|
||||
- libassuan_config_prefix="$withval", libassuan_config_prefix="")
|
||||
- if test x$libassuan_config_prefix != x ; then
|
||||
- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
||||
- if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
|
||||
tmp=ifelse([$1], ,1:0.9.2,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
@@ -37,51 +25,12 @@
|
||||
min_libassuan_version="$tmp"
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
||||
- ok=no
|
||||
- if test "$LIBASSUAN_CONFIG" != "no" \
|
||||
- && test -f "$LIBASSUAN_CONFIG" ; then
|
||||
- req_major=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
-
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
|
||||
- major=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
- minor=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
- micro=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||
-
|
||||
- if test "$major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$major" -eq "$req_major"; then
|
||||
- if test "$minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$minor" -eq "$req_minor"; then
|
||||
- if test "$micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- if test $ok = yes; then
|
||||
- AC_MSG_RESULT([yes ($libassuan_config_version)])
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(LIBASSUAN, [libassuan >= $min_libassuan_version], [ok=yes], [ok=no])
|
||||
|
||||
if test $ok = yes; then
|
||||
if test "$req_libassuan_api" -gt 0 ; then
|
||||
tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
+ tmp=`$PKG_CONFIG --variable=api_version libassuan`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
AC_MSG_CHECKING([LIBASSUAN API version])
|
||||
if test "$req_libassuan_api" -eq "$tmp" ; then
|
||||
@@ -96,7 +45,7 @@
|
||||
|
||||
if test $ok = yes; then
|
||||
if test x"$host" != x ; then
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
|
||||
+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan`
|
||||
if test x"$libassuan_config_host" != xnone ; then
|
||||
if test x"$libassuan_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
@@ -137,12 +86,8 @@
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1)
|
||||
if test $ok = yes; then
|
||||
- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
||||
- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
- LIBASSUAN_CFLAGS=""
|
||||
- LIBASSUAN_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBASSUAN_CFLAGS)
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue