diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch new file mode 100644 index 0000000000..c6dbf1b75a --- /dev/null +++ b/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | Upstream-Status: Inappropriate [openembedded specific] | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | |||
6 | Index: gnupg-2.1.0/m4/npth.m4 | ||
7 | =================================================================== | ||
8 | --- gnupg-2.1.0.orig/m4/npth.m4 | ||
9 | +++ gnupg-2.1.0/m4/npth.m4 | ||
10 | @@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], | ||
11 | if test "x$npth_config_prefix" != x ; then | ||
12 | NPTH_CONFIG="$npth_config_prefix/bin/npth-config" | ||
13 | fi | ||
14 | - AC_PATH_PROG(NPTH_CONFIG, npth-config, no) | ||
15 | + AC_PATH_PROG(PKGCONFIG, pkg-config, no) | ||
16 | |||
17 | - if test "$NPTH_CONFIG" != "no" ; then | ||
18 | - npth_version=`$NPTH_CONFIG --version` | ||
19 | + if test "$PKGCONFIG" != "no" ; then | ||
20 | + npth_version=`$PKGCONFIG --modversion npth` | ||
21 | fi | ||
22 | npth_version_major=`echo $npth_version | \ | ||
23 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` | ||
24 | @@ -45,7 +45,7 @@ AC_DEFUN([AM_PATH_NPTH], | ||
25 | |||
26 | AC_MSG_CHECKING(for NPTH - version >= $min_npth_version) | ||
27 | ok=no | ||
28 | - if test "$NPTH_CONFIG" != "no" ; then | ||
29 | + if test "$PKGCONFIG" != "no" ; then | ||
30 | req_major=`echo $min_npth_version | \ | ||
31 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` | ||
32 | req_minor=`echo $min_npth_version | \ | ||
33 | @@ -66,28 +66,9 @@ AC_DEFUN([AM_PATH_NPTH], | ||
34 | fi | ||
35 | if test $ok = yes; then | ||
36 | AC_MSG_RESULT([yes ($npth_version)]) | ||
37 | - else | ||
38 | - AC_MSG_RESULT(no) | ||
39 | - fi | ||
40 | - if test $ok = yes; then | ||
41 | - # If we have a recent NPTH, we should also check that the | ||
42 | - # API is compatible. | ||
43 | - if test "$req_npth_api" -gt 0 ; then | ||
44 | - tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0` | ||
45 | - if test "$tmp" -gt 0 ; then | ||
46 | - AC_MSG_CHECKING([NPTH API version]) | ||
47 | - if test "$req_npth_api" -eq "$tmp" ; then | ||
48 | - AC_MSG_RESULT([okay]) | ||
49 | - else | ||
50 | - ok=no | ||
51 | - AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp]) | ||
52 | - fi | ||
53 | - fi | ||
54 | - fi | ||
55 | - fi | ||
56 | - if test $ok = yes; then | ||
57 | - NPTH_CFLAGS=`$NPTH_CONFIG --cflags` | ||
58 | - NPTH_LIBS=`$NPTH_CONFIG --libs` | ||
59 | + NPTH_CFLAGS=`$PKGCONFIG --cflags npth` | ||
60 | + NPTH_LIBS=`$PKGCONFIG --libs npth` | ||
61 | + AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]]) | ||
62 | ifelse([$2], , :, [$2]) | ||
63 | npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none` | ||
64 | if test x"$npth_config_host" != xnone ; then | ||
65 | @@ -103,6 +84,7 @@ AC_DEFUN([AM_PATH_NPTH], | ||
66 | fi | ||
67 | fi | ||
68 | else | ||
69 | + AC_MSG_RESULT(no) | ||
70 | NPTH_CFLAGS="" | ||
71 | NPTH_LIBS="" | ||
72 | ifelse([$3], , :, [$3]) | ||