diff options
Diffstat (limited to 'meta/recipes-support/pinentry/pinentry-1.1.1')
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch | 177 | ||||
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch | 170 |
2 files changed, 0 insertions, 347 deletions
diff --git a/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch deleted file mode 100644 index 537735dba8..0000000000 --- a/meta/recipes-support/pinentry/pinentry-1.1.1/gpg-error_pkconf.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 7b60f1563ecdb7020c145de8a96cae1c0a66c595 Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster@mvista.com> -Date: Fri, 2 Sep 2005 11:50:01 +0000 -Subject: [PATCH] Add gtk+, avahi, dbus-0.34 (.36 coming soon) and - -Convert to pkg-config support to match changes done to -the gpg-error recipe for gpg-error.pc generation. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - m4/gpg-error.m4 | 141 ++---------------------------------------------- - 1 file changed, 4 insertions(+), 137 deletions(-) - -diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 -index c9b235f..a4fd41c 100644 ---- a/m4/gpg-error.m4 -+++ b/m4/gpg-error.m4 -@@ -25,141 +25,12 @@ dnl config script does not match the host specification the script - dnl is added to the gpg_config_script_warn variable. - dnl - AC_DEFUN([AM_PATH_GPG_ERROR], --[ AC_REQUIRE([AC_CANONICAL_HOST]) -- gpg_error_config_prefix="" -- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, -- dnl since that is consistent with how our three siblings use the directory/ -- dnl package name in --with-$dir_name-prefix=PFX. -- AC_ARG_WITH(libgpg-error-prefix, -- AS_HELP_STRING([--with-libgpg-error-prefix=PFX], -- [prefix where GPG Error is installed (optional)]), -- [gpg_error_config_prefix="$withval"]) -- -- dnl Accept --with-gpg-error-prefix and make it work the same as -- dnl --with-libgpg-error-prefix above, for backwards compatibility, -- dnl but do not document this old, inconsistently-named option. -- AC_ARG_WITH(gpg-error-prefix,, -- [gpg_error_config_prefix="$withval"]) -- -- if test x"${GPG_ERROR_CONFIG}" = x ; then -- if test x"${gpg_error_config_prefix}" != x ; then -- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" -- else -- case "${SYSROOT}" in -- /*) -- if test -x "${SYSROOT}/bin/gpg-error-config" ; then -- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" -- fi -- ;; -- '') -- ;; -- *) -- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) -- ;; -- esac -- fi -- fi -- -- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -- min_gpg_error_version=ifelse([$1], ,1.33,$1) -- ok=no -- -- if test "$prefix" = NONE ; then -- prefix_option_expanded=/usr/local -- else -- prefix_option_expanded="$prefix" -- fi -- if test "$exec_prefix" = NONE ; then -- exec_prefix_option_expanded=$prefix_option_expanded -- else -- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) -- fi -- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) -- -- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then -- gpgrt_libdir=$libdir_option_expanded -- else -- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then -- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then -- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then -- gpgrt_libdir=$possible_libdir -- fi -- fi -- fi -- fi -- -- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then -- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) -- if test "$GPGRT_CONFIG" = "no"; then -- unset GPGRT_CONFIG -- else -- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" -- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then -- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" -- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) -- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` -- else -- unset GPGRT_CONFIG -- fi -- fi -- else -- gpg_error_config_version=`$GPG_ERROR_CONFIG --version` -- fi -- if test "$GPG_ERROR_CONFIG" != "no"; then -- req_major=`echo $min_gpg_error_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -- req_minor=`echo $min_gpg_error_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -- major=`echo $gpg_error_config_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -- minor=`echo $gpg_error_config_version | \ -- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -- if test "$major" -gt "$req_major"; then -- ok=yes -- else -- if test "$major" -eq "$req_major"; then -- if test "$minor" -ge "$req_minor"; then -- ok=yes -- fi -- fi -- fi -- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then -- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then -- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) -- if test "$GPGRT_CONFIG" = "no"; then -- unset GPGRT_CONFIG -- else -- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" -- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then -- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" -- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) -- else -- unset GPGRT_CONFIG -- fi -- fi -- fi -- fi -- fi -- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) -+[ -+ min_gpg_error_version=ifelse([$1], ,0.0,$1) -+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no]) - if test $ok = yes; then -- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` -- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` -- if test -z "$GPGRT_CONFIG"; then -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` -- else -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` -- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS" -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null` -- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS" -- fi -- AC_MSG_RESULT([yes ($gpg_error_config_version)]) - ifelse([$2], , :, [$2]) -- if test -z "$GPGRT_CONFIG"; then -- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none` -- else -- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none` -- fi -+ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none` - if test x"$gpg_error_config_host" != xnone ; then - if test x"$gpg_error_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -174,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], - fi - fi - else -- GPG_ERROR_CFLAGS="" -- GPG_ERROR_LIBS="" -- GPG_ERROR_MT_CFLAGS="" -- GPG_ERROR_MT_LIBS="" - AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi diff --git a/meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch deleted file mode 100644 index f4aec2d1c3..0000000000 --- a/meta/recipes-support/pinentry/pinentry-1.1.1/libassuan_pkgconf.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 26fb6c3faa27180c8ed9ada1728c3d8683a65f3a Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster@mvista.com> -Date: Thu, 22 May 2014 10:50:00 +0100 -Subject: [PATCH] libassuan: Improve pkgconfig support - -Convert to pkg-config support to match changes done to -the libassuan recipe for libassuan.pc generation. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - configure.ac | 4 +-- - m4/libassuan.m4 | 93 ++++--------------------------------------------- - 2 files changed, 9 insertions(+), 88 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d8dcc0c..ca51766 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -267,8 +267,8 @@ if test "$have_libassuan" = "yes"; then - [version of the libassuan library]) - fi - --COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS" --COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS" -+COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS" -+COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS" - - - dnl Checks for libsecmem. -diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 -index df50484..2057412 100644 ---- a/m4/libassuan.m4 -+++ b/m4/libassuan.m4 -@@ -15,30 +15,8 @@ dnl - dnl Common code used for libassuan detection [internal] - dnl Returns ok set to yes or no. - dnl --AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], --[ AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_ARG_WITH(libassuan-prefix, -- AS_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 -- if test x${LIBASSUAN_CONFIG+set} != xset ; then -- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config -- fi -- fi -- -- 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 -- -+AC_DEFUN([AM_PATH_LIBASSUAN_COMMON], -+[ - tmp=ifelse([$1], ,1:0.9.2,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -@@ -48,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"; 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/'` -- -- 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 | \ -- 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_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no]) - - if test $ok = yes; then - if test "$req_libassuan_api" -gt 0 ; then -- 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 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBASSUAN API version]) - if test "$req_libassuan_api" -eq "$tmp" ; then -@@ -114,11 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], - - if test $ok = yes; then - if test x"$host" != x ; then -- 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` -- fi -+ libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0` - if test x"$libassuan_config_host" != xnone ; then - if test x"$libassuan_config_host" != x"$host" ; then - AC_MSG_WARN([[ -@@ -141,7 +68,7 @@ dnl Test whether libassuan has at least MINIMUM-VERSION. This is - dnl used to test for features only available in newer versions. - dnl - AC_DEFUN([AM_CHECK_LIBASSUAN], --[ _AM_PATH_LIBASSUAN_COMMON($1) -+[ AM_PATH_LIBASSUAN_COMMON($1) - if test $ok = yes; then - ifelse([$2], , :, [$2]) - else -@@ -157,16 +84,10 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS - dnl - AC_DEFUN([AM_PATH_LIBASSUAN], --[ _AM_PATH_LIBASSUAN_COMMON($1) -+[ AM_PATH_LIBASSUAN_COMMON($1) - if test $ok = yes; then -- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` -- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` - ifelse([$2], , :, [$2]) - else -- LIBASSUAN_CFLAGS="" -- LIBASSUAN_LIBS="" - ifelse([$3], , :, [$3]) - fi -- AC_SUBST(LIBASSUAN_CFLAGS) -- AC_SUBST(LIBASSUAN_LIBS) - ]) |