diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch index 0c15cc7c38..8ed39280ca 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001 | 1 | From ee1421f7a7a9f31400ba992a5be52b88d20170c9 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 10 May 2019 14:18:04 +0800 | 3 | Date: Fri, 10 May 2019 14:18:04 +0800 |
4 | Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." | 4 | Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." |
@@ -10,36 +10,21 @@ The oe-core does not support gpgrt-config, so revert it | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | 11 | ||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/gpgme.m4 | 58 +++++++++------------------------------------------- | 15 | src/gpgme.m4 | 54 ++++++++-------------------------------------------- |
15 | 1 file changed, 10 insertions(+), 48 deletions(-) | 16 | 1 file changed, 8 insertions(+), 46 deletions(-) |
16 | 17 | ||
17 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 | 18 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 |
18 | index c749a5d..8579146 100644 | 19 | index f2906c1..8cc2898 100644 |
19 | --- a/src/gpgme.m4 | 20 | --- a/src/gpgme.m4 |
20 | +++ b/src/gpgme.m4 | 21 | +++ b/src/gpgme.m4 |
21 | @@ -1,5 +1,5 @@ | 22 | @@ -125,24 +125,10 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl |
22 | # gpgme.m4 - autoconf macro to detect GPGME. | ||
23 | -# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH | ||
24 | +# Copyright (C) 2002, 2003, 2004, 2014 g10 Code GmbH | ||
25 | # | ||
26 | # This file is free software; as a special exception the author gives | ||
27 | # unlimited permission to copy and/or distribute it, with or without | ||
28 | @@ -9,7 +9,7 @@ | ||
29 | # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the | ||
30 | # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
31 | # | ||
32 | -# Last-changed: 2020-11-20 | ||
33 | +# Last-changed: 2014-10-02 | ||
34 | |||
35 | |||
36 | AC_DEFUN([_AM_PATH_GPGME_CONFIG], | ||
37 | @@ -36,24 +36,10 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], | ||
38 | fi | 23 | fi |
39 | fi | 24 | fi |
40 | 25 | ||
41 | - use_gpgrt_config="" | 26 | - use_gpgrt_config="" |
42 | - if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | 27 | - if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
43 | - if $GPGRT_CONFIG gpgme --exists; then | 28 | - if $GPGRT_CONFIG gpgme --exists; then |
44 | - GPGME_CONFIG="$GPGRT_CONFIG gpgme" | 29 | - GPGME_CONFIG="$GPGRT_CONFIG gpgme" |
45 | - AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) | 30 | - AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) |
@@ -61,7 +46,7 @@ index c749a5d..8579146 100644 | |||
61 | fi | 46 | fi |
62 | gpgme_version_major=`echo $gpgme_version | \ | 47 | gpgme_version_major=`echo $gpgme_version | \ |
63 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` | 48 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
64 | @@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], | 49 | @@ -155,16 +141,12 @@ AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl |
65 | 50 | ||
66 | AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], | 51 | AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], |
67 | [ | 52 | [ |
@@ -80,7 +65,7 @@ index c749a5d..8579146 100644 | |||
80 | *** built for $gpgme_config_host and thus may not match the | 65 | *** built for $gpgme_config_host and thus may not match the |
81 | *** used host $host. | 66 | *** used host $host. |
82 | *** You may want to use the configure option --with-gpgme-prefix | 67 | *** You may want to use the configure option --with-gpgme-prefix |
83 | @@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], | 68 | @@ -225,11 +207,7 @@ AC_DEFUN([AM_PATH_GPGME], |
84 | # If we have a recent GPGME, we should also check that the | 69 | # If we have a recent GPGME, we should also check that the |
85 | # API is compatible. | 70 | # API is compatible. |
86 | if test "$req_gpgme_api" -gt 0 ; then | 71 | if test "$req_gpgme_api" -gt 0 ; then |
@@ -93,7 +78,7 @@ index c749a5d..8579146 100644 | |||
93 | if test "$tmp" -gt 0 ; then | 78 | if test "$tmp" -gt 0 ; then |
94 | if test "$req_gpgme_api" -ne "$tmp" ; then | 79 | if test "$req_gpgme_api" -ne "$tmp" ; then |
95 | ok=no | 80 | ok=no |
96 | @@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | 81 | @@ -372,11 +350,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
97 | # If we have a recent GPGME, we should also check that the | 82 | # If we have a recent GPGME, we should also check that the |
98 | # API is compatible. | 83 | # API is compatible. |
99 | if test "$req_gpgme_api" -gt 0 ; then | 84 | if test "$req_gpgme_api" -gt 0 ; then |
@@ -106,7 +91,7 @@ index c749a5d..8579146 100644 | |||
106 | if test "$tmp" -gt 0 ; then | 91 | if test "$tmp" -gt 0 ; then |
107 | if test "$req_gpgme_api" -ne "$tmp" ; then | 92 | if test "$req_gpgme_api" -ne "$tmp" ; then |
108 | ok=no | 93 | ok=no |
109 | @@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | 94 | @@ -385,20 +359,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
110 | fi | 95 | fi |
111 | fi | 96 | fi |
112 | if test $ok = yes; then | 97 | if test $ok = yes; then |
@@ -129,6 +114,3 @@ index c749a5d..8579146 100644 | |||
129 | AC_MSG_RESULT(yes) | 114 | AC_MSG_RESULT(yes) |
130 | ifelse([$2], , :, [$2]) | 115 | ifelse([$2], , :, [$2]) |
131 | _AM_PATH_GPGME_CONFIG_HOST_CHECK | 116 | _AM_PATH_GPGME_CONFIG_HOST_CHECK |
132 | -- | ||
133 | 2.25.1 | ||
134 | |||