diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/pkgconfig.patch | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch b/meta/recipes-support/gnupg/gnupg/pkgconfig.patch index ae92392dae..5e036bac90 100644 --- a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch +++ b/meta/recipes-support/gnupg/gnupg/pkgconfig.patch | |||
@@ -5,11 +5,11 @@ Upstream-Status: Rejected | |||
5 | 5 | ||
6 | RP 2014/5/22 | 6 | RP 2014/5/22 |
7 | 7 | ||
8 | Index: gnupg-2.0.22/m4/gnupg-pth.m4 | 8 | Index: gnupg-2.1.0/m4/gnupg-pth.m4 |
9 | =================================================================== | 9 | =================================================================== |
10 | --- gnupg-2.0.22.orig/m4/gnupg-pth.m4 2013-10-04 12:32:53.000000000 +0000 | 10 | --- gnupg-2.1.0.orig/m4/gnupg-pth.m4 |
11 | +++ gnupg-2.0.22/m4/gnupg-pth.m4 2014-05-13 21:33:21.000000000 +0000 | 11 | +++ gnupg-2.1.0/m4/gnupg-pth.m4 |
12 | @@ -17,33 +17,9 @@ | 12 | @@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY |
13 | # Taken and modified from the m4 macros which come with Pth. | 13 | # Taken and modified from the m4 macros which come with Pth. |
14 | AC_DEFUN([GNUPG_PTH_VERSION_CHECK], | 14 | AC_DEFUN([GNUPG_PTH_VERSION_CHECK], |
15 | [ | 15 | [ |
@@ -44,7 +44,7 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4 | |||
44 | if test $have_pth = yes; then | 44 | if test $have_pth = yes; then |
45 | AC_MSG_RESULT(yes) | 45 | AC_MSG_RESULT(yes) |
46 | AC_MSG_CHECKING([whether PTH installation is sane]) | 46 | AC_MSG_CHECKING([whether PTH installation is sane]) |
47 | @@ -51,9 +29,9 @@ | 47 | @@ -51,9 +27,9 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], |
48 | _gnupg_pth_save_cflags=$CFLAGS | 48 | _gnupg_pth_save_cflags=$CFLAGS |
49 | _gnupg_pth_save_ldflags=$LDFLAGS | 49 | _gnupg_pth_save_ldflags=$LDFLAGS |
50 | _gnupg_pth_save_libs=$LIBS | 50 | _gnupg_pth_save_libs=$LIBS |
@@ -57,30 +57,34 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4 | |||
57 | AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h> | 57 | AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h> |
58 | ], | 58 | ], |
59 | [[ pth_init ();]])], | 59 | [[ pth_init ();]])], |
60 | @@ -81,23 +59,11 @@ | 60 | @@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK], |
61 | # PTH_CLFAGS and PTH_LIBS are AS_SUBST. | ||
61 | # | 62 | # |
62 | AC_DEFUN([GNUPG_PATH_PTH], | 63 | AC_DEFUN([GNUPG_PATH_PTH], |
63 | +[ | ||
64 | -[ AC_ARG_WITH(pth-prefix, | 64 | -[ AC_ARG_WITH(pth-prefix, |
65 | - AC_HELP_STRING([--with-pth-prefix=PFX], | 65 | - AC_HELP_STRING([--with-pth-prefix=PFX], |
66 | - [prefix where GNU Pth is installed]), | 66 | - [prefix where GNU Pth is installed (optional)]), |
67 | - pth_config_prefix="$withval", pth_config_prefix="") | 67 | - pth_config_prefix="$withval", pth_config_prefix="") |
68 | - if test x$pth_config_prefix != x ; then | 68 | - if test x$pth_config_prefix != x ; then |
69 | - PTH_CONFIG="$pth_config_prefix/bin/pth-config" | 69 | - PTH_CONFIG="$pth_config_prefix/bin/pth-config" |
70 | - fi | 70 | - fi |
71 | - AC_PATH_PROG(PTH_CONFIG, pth-config, no) | 71 | - AC_PATH_PROG(PTH_CONFIG, pth-config, no) |
72 | +[ | ||
72 | tmp=ifelse([$1], ,1.3.7,$1) | 73 | tmp=ifelse([$1], ,1.3.7,$1) |
73 | - if test "$PTH_CONFIG" != "no"; then | 74 | - if test "$PTH_CONFIG" != "no"; then |
74 | - GNUPG_PTH_VERSION_CHECK($tmp) | 75 | - GNUPG_PTH_VERSION_CHECK($tmp) |
75 | - if test $have_pth = yes; then | 76 | - if test $have_pth = yes; then |
76 | - PTH_CFLAGS=`$PTH_CONFIG --cflags` | 77 | - PTH_CFLAGS=`$PTH_CONFIG --cflags` |
77 | - PTH_LIBS=`$PTH_CONFIG --ldflags` | 78 | - PTH_LIBS=`$PTH_CONFIG --ldflags` |
78 | - PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" | 79 | - PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" |
80 | - AC_DEFINE(HAVE_PTH, 1, | ||
79 | + GNUPG_PTH_VERSION_CHECK($tmp) | 81 | + GNUPG_PTH_VERSION_CHECK($tmp) |
80 | + if test $have_pth = yes; then | 82 | + if test $have_pth = yes; then |
81 | AC_DEFINE(HAVE_PTH, 1, | 83 | + AC_DEFINE(HAVE_PTH, 1, |
82 | [Defined if the GNU Pth is available]) | 84 | [Defined if the GNU Pth is available]) |
83 | - fi | 85 | - fi |
84 | fi | 86 | fi |
85 | AC_SUBST(PTH_CFLAGS) | 87 | AC_SUBST(PTH_CFLAGS) |
86 | AC_SUBST(PTH_LIBS) | 88 | AC_SUBST(PTH_LIBS) |
89 | ]) | ||
90 | - | ||