mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
libassuan: update to 2.5.2
Refresh patch (From OE-Core rev: ccb638d4463caffb4319910f24acb9843ab751c6) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
committed by
Richard Purdie
Richard Purdie
parent
142bfedad4
commit
a39f6074d4
@@ -9,60 +9,11 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
|
||||
forward ported to 2.4.4
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
Index: libassuan-2.4.4/libassuan.pc.in
|
||||
Index: libassuan-2.5.2/src/libassuan.m4
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ libassuan-2.4.4/libassuan.pc.in
|
||||
@@ -0,0 +1,13 @@
|
||||
+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.4.4/Makefile.am
|
||||
===================================================================
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc
|
||||
# (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 = autogen.sh autogen.rc README.GIT VERSION \
|
||||
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
|
||||
|
||||
if BUILD_DOC
|
||||
doc = doc
|
||||
Index: 2.4.4-r0/libassuan-2.4.4/configure.ac
|
||||
===================================================================
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -485,6 +485,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([libassuan.pc])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
Index: libassuan-2.4.4/src/libassuan.m4
|
||||
===================================================================
|
||||
--- a/src/libassuan.m4
|
||||
+++ b/src/libassuan.m4
|
||||
@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no.
|
||||
--- libassuan-2.5.2.orig/src/libassuan.m4
|
||||
+++ libassuan-2.5.2/src/libassuan.m4
|
||||
@@ -16,27 +16,6 @@ dnl Returns ok set to yes or no.
|
||||
dnl
|
||||
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
@@ -71,24 +22,32 @@ Index: libassuan-2.4.4/src/libassuan.m4
|
||||
- [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)
|
||||
- use_gpgrt_config=""
|
||||
- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
|
||||
- if $GPGRT_CONFIG libassuan --exists; then
|
||||
- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
|
||||
- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
|
||||
- use_gpgrt_config=yes
|
||||
- fi
|
||||
- fi
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
- fi
|
||||
|
||||
tmp=ifelse([$1], ,1:0.9.2,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
@@ -47,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
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
|
||||
- if test "$LIBASSUAN_CONFIG" != "no"; then
|
||||
- req_major=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_libassuan_version | \
|
||||
@@ -96,7 +55,11 @@ Index: libassuan-2.4.4/src/libassuan.m4
|
||||
- req_micro=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
-
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
|
||||
- else
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
|
||||
- fi
|
||||
- major=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
- minor=`echo $libassuan_config_version | \
|
||||
@@ -130,26 +93,32 @@ Index: libassuan-2.4.4/src/libassuan.m4
|
||||
|
||||
if test $ok = yes; then
|
||||
if test "$req_libassuan_api" -gt 0 ; then
|
||||
tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- if test -z "$use_gpgrt_config"; then
|
||||
- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
- else
|
||||
- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
|
||||
- fi
|
||||
+ 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
|
||||
@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
|
||||
@@ -114,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
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 -z "$use_gpgrt_config"; then
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
|
||||
- else
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
|
||||
+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan`
|
||||
fi
|
||||
if test x"$libassuan_config_host" != xnone ; then
|
||||
if test x"$libassuan_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
@@ -138,12 +87,8 @@ dnl
|
||||
@@ -158,12 +88,8 @@ dnl
|
||||
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`
|
||||
- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
|
||||
- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
- LIBASSUAN_CFLAGS=""
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
|
||||
file://libassuan-add-pkgconfig-support.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "4354b7ae296894f232ada226a062d7d7"
|
||||
SRC_URI[sha256sum] = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"
|
||||
SRC_URI[md5sum] = "4d0d5738936bd8f4f0287e1dd80432b6"
|
||||
SRC_URI[sha256sum] = "986b1bf277e375f7a960450fbb8ffbd45294d06598916ad4ebf79aee0cb788e7"
|
||||
|
||||
BINCONFIG = "${bindir}/libassuan-config"
|
||||
|
||||
Reference in New Issue
Block a user