diff options
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch')
-rw-r--r-- | meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch | 73 |
1 files changed, 45 insertions, 28 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch index 6d86e5c99b..0e58fd4c4d 100644 --- a/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch +++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 53c2aec2e13f4e2d09be7148869c862f07dfdd4d Mon Sep 17 00:00:00 2001 | 1 | From d9048788d906774b1475c3bb1b17e22455c2add4 Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Wed, 16 Aug 2017 11:16:30 +0800 | 3 | Date: Wed, 16 Aug 2017 11:16:30 +0800 |
4 | Subject: [PATCH 2/4] use pkgconfig instead of npth config | 4 | Subject: [PATCH] use pkgconfig instead of npth config |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [openembedded specific] | 6 | Upstream-Status: Inappropriate [openembedded specific] |
7 | 7 | ||
@@ -9,29 +9,45 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com> | |||
9 | 9 | ||
10 | Rebase to 2.1.23 | 10 | Rebase to 2.1.23 |
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | m4/npth.m4 | 34 ++++++++-------------------------- | 14 | m4/npth.m4 | 53 ++++++++--------------------------------------------- |
14 | 1 file changed, 8 insertions(+), 26 deletions(-) | 15 | 1 file changed, 8 insertions(+), 45 deletions(-) |
15 | 16 | ||
16 | diff --git a/m4/npth.m4 b/m4/npth.m4 | 17 | diff --git a/m4/npth.m4 b/m4/npth.m4 |
17 | index 17c2644..15a931b 100644 | 18 | index 619ed89..0cb354d 100644 |
18 | --- a/m4/npth.m4 | 19 | --- a/m4/npth.m4 |
19 | +++ b/m4/npth.m4 | 20 | +++ b/m4/npth.m4 |
20 | @@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], | 21 | @@ -19,25 +19,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG], |
21 | if test "x$npth_config_prefix" != x ; then | 22 | if test "x$npth_config_prefix" != x ; then |
22 | NPTH_CONFIG="$npth_config_prefix/bin/npth-config" | 23 | NPTH_CONFIG="$npth_config_prefix/bin/npth-config" |
23 | fi | 24 | fi |
24 | - AC_PATH_PROG(NPTH_CONFIG, npth-config, no) | ||
25 | + AC_PATH_PROG(PKGCONFIG, pkg-config, no) | 25 | + AC_PATH_PROG(PKGCONFIG, pkg-config, no) |
26 | 26 | ||
27 | - use_gpgrt_config="" | ||
28 | - if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | ||
29 | - if $GPGRT_CONFIG npth --exists; then | ||
30 | - NPTH_CONFIG="$GPGRT_CONFIG npth" | ||
31 | - AC_MSG_NOTICE([Use gpgrt-config as npth-config]) | ||
32 | - use_gpgrt_config=yes | ||
33 | - fi | ||
34 | - fi | ||
35 | - if test -z "$use_gpgrt_config"; then | ||
36 | - AC_PATH_PROG(NPTH_CONFIG, npth-config, no) | ||
37 | - fi | ||
38 | - | ||
27 | - if test "$NPTH_CONFIG" != "no" ; then | 39 | - if test "$NPTH_CONFIG" != "no" ; then |
28 | - npth_version=`$NPTH_CONFIG --version` | 40 | - if test -z "$use_gpgrt_config"; then |
41 | - npth_version=`$NPTH_CONFIG --version` | ||
42 | - else | ||
43 | - npth_version=`$NPTH_CONFIG --modversion` | ||
44 | - fi | ||
29 | + if test "$PKGCONFIG" != "no" ; then | 45 | + if test "$PKGCONFIG" != "no" ; then |
30 | + npth_version=`$PKGCONFIG --modversion npth` | 46 | + npth_version=`$PKGCONFIG --modversion npth` |
31 | fi | 47 | fi |
32 | npth_version_major=`echo $npth_version | \ | 48 | npth_version_major=`echo $npth_version | \ |
33 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` | 49 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
34 | @@ -45,7 +45,7 @@ AC_DEFUN([AM_PATH_NPTH], | 50 | @@ -62,7 +47,7 @@ AC_DEFUN([AM_PATH_NPTH], |
35 | 51 | ||
36 | AC_MSG_CHECKING(for NPTH - version >= $min_npth_version) | 52 | AC_MSG_CHECKING(for NPTH - version >= $min_npth_version) |
37 | ok=no | 53 | ok=no |
@@ -40,7 +56,7 @@ index 17c2644..15a931b 100644 | |||
40 | req_major=`echo $min_npth_version | \ | 56 | req_major=`echo $min_npth_version | \ |
41 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` | 57 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
42 | req_minor=`echo $min_npth_version | \ | 58 | req_minor=`echo $min_npth_version | \ |
43 | @@ -66,28 +66,9 @@ AC_DEFUN([AM_PATH_NPTH], | 59 | @@ -83,32 +68,9 @@ AC_DEFUN([AM_PATH_NPTH], |
44 | fi | 60 | fi |
45 | if test $ok = yes; then | 61 | if test $ok = yes; then |
46 | AC_MSG_RESULT([yes ($npth_version)]) | 62 | AC_MSG_RESULT([yes ($npth_version)]) |
@@ -48,20 +64,24 @@ index 17c2644..15a931b 100644 | |||
48 | - AC_MSG_RESULT(no) | 64 | - AC_MSG_RESULT(no) |
49 | - fi | 65 | - fi |
50 | - if test $ok = yes; then | 66 | - if test $ok = yes; then |
51 | - # If we have a recent NPTH, we should also check that the | 67 | - # If we have a recent NPTH, we should also check that the |
52 | - # API is compatible. | 68 | - # API is compatible. |
53 | - if test "$req_npth_api" -gt 0 ; then | 69 | - if test "$req_npth_api" -gt 0 ; then |
70 | - if test -z "$use_gpgrt_config"; then | ||
54 | - tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0` | 71 | - tmp=`$NPTH_CONFIG --api-version 2>/dev/null || echo 0` |
55 | - if test "$tmp" -gt 0 ; then | 72 | - else |
56 | - AC_MSG_CHECKING([NPTH API version]) | 73 | - tmp=`$NPTH_CONFIG --variable=api_version 2>/dev/null || echo 0` |
57 | - if test "$req_npth_api" -eq "$tmp" ; then | 74 | - fi |
58 | - AC_MSG_RESULT([okay]) | 75 | - if test "$tmp" -gt 0 ; then |
59 | - else | 76 | - AC_MSG_CHECKING([NPTH API version]) |
60 | - ok=no | 77 | - if test "$req_npth_api" -eq "$tmp" ; then |
61 | - AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp]) | 78 | - AC_MSG_RESULT([okay]) |
62 | - fi | 79 | - else |
80 | - ok=no | ||
81 | - AC_MSG_RESULT([does not match. want=$req_npth_api got=$tmp]) | ||
63 | - fi | 82 | - fi |
64 | - fi | 83 | - fi |
84 | - fi | ||
65 | - fi | 85 | - fi |
66 | - if test $ok = yes; then | 86 | - if test $ok = yes; then |
67 | - NPTH_CFLAGS=`$NPTH_CONFIG --cflags` | 87 | - NPTH_CFLAGS=`$NPTH_CONFIG --cflags` |
@@ -70,9 +90,9 @@ index 17c2644..15a931b 100644 | |||
70 | + NPTH_LIBS=`$PKGCONFIG --libs npth` | 90 | + NPTH_LIBS=`$PKGCONFIG --libs npth` |
71 | + AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]]) | 91 | + AC_MSG_WARN([[GOT HERE - $NPTH_LIBS ]]) |
72 | ifelse([$2], , :, [$2]) | 92 | ifelse([$2], , :, [$2]) |
73 | npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none` | 93 | if test -z "$use_gpgrt_config"; then |
74 | if test x"$npth_config_host" != xnone ; then | 94 | npth_config_host=`$NPTH_CONFIG --host 2>/dev/null || echo none` |
75 | @@ -103,6 +84,7 @@ AC_DEFUN([AM_PATH_NPTH], | 95 | @@ -128,6 +90,7 @@ AC_DEFUN([AM_PATH_NPTH], |
76 | fi | 96 | fi |
77 | fi | 97 | fi |
78 | else | 98 | else |
@@ -80,6 +100,3 @@ index 17c2644..15a931b 100644 | |||
80 | NPTH_CFLAGS="" | 100 | NPTH_CFLAGS="" |
81 | NPTH_LIBS="" | 101 | NPTH_LIBS="" |
82 | ifelse([$3], , :, [$3]) | 102 | ifelse([$3], , :, [$3]) |
83 | -- | ||
84 | 1.8.3.1 | ||
85 | |||