diff options
Diffstat (limited to 'meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch')
| -rw-r--r-- | meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch deleted file mode 100644 index 431edb0351..0000000000 --- a/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch +++ /dev/null @@ -1,100 +0,0 @@ -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> - -Index: pinentry-1.0.0/m4/gpg-error.m4 -=================================================================== ---- pinentry-1.0.0.orig/m4/gpg-error.m4 -+++ pinentry-1.0.0/m4/gpg-error.m4 -@@ -25,74 +25,12 @@ dnl config script does not match the hos - 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, -- AC_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], ,0.0,$1) -- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) -- ok=no -- if test "$GPG_ERROR_CONFIG" != "no" \ -- && test -f "$GPG_ERROR_CONFIG" ; 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/'` -- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` -- 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 -- fi -+ 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 $gpg_error_config_args --cflags` -- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` -- AC_MSG_RESULT([yes ($gpg_error_config_version)]) - ifelse([$2], , :, [$2]) -- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` -+ 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([[ -@@ -107,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 |