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 | 134 |
1 files changed, 134 insertions, 0 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 new file mode 100644 index 0000000000..0ed4eb6818 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch | |||
@@ -0,0 +1,134 @@ | |||
1 | From a001b3c23bf80fd752044615b9bba6b926ff9666 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 10 May 2019 14:18:04 +0800 | ||
4 | Subject: [PATCH] Revert "build: Make gpgme.m4 use gpgrt-config with *.pc." | ||
5 | |||
6 | This reverts commit 60828a505a1c74fd34476c181df2a588ea6f9c83. | ||
7 | |||
8 | The oe-core does not support gpgrt-config, so revert it | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | src/gpgme.m4 | 58 ++++++++++------------------------------------------------ | ||
15 | 1 file changed, 10 insertions(+), 48 deletions(-) | ||
16 | |||
17 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 | ||
18 | index 2a72f18..6c2be44 100644 | ||
19 | --- a/src/gpgme.m4 | ||
20 | +++ b/src/gpgme.m4 | ||
21 | @@ -1,5 +1,5 @@ | ||
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: 2018-11-12 | ||
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 | ||
39 | fi | ||
40 | |||
41 | - use_gpgrt_config="" | ||
42 | - if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then | ||
43 | - if $GPGRT_CONFIG gpgme --exists; then | ||
44 | - GPGME_CONFIG="$GPGRT_CONFIG gpgme" | ||
45 | - AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) | ||
46 | - use_gpgrt_config=yes | ||
47 | - fi | ||
48 | - fi | ||
49 | - if test -z "$use_gpgrt_config"; then | ||
50 | - AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) | ||
51 | - fi | ||
52 | + AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) | ||
53 | |||
54 | if test "$GPGME_CONFIG" != "no" ; then | ||
55 | - if test -z "$use_gpgrt_config"; then | ||
56 | - gpgme_version=`$GPGME_CONFIG --version` | ||
57 | - else | ||
58 | - gpgme_version=`$GPGME_CONFIG --modversion` | ||
59 | - fi | ||
60 | + gpgme_version=`$GPGME_CONFIG --version` | ||
61 | fi | ||
62 | gpgme_version_major=`echo $gpgme_version | \ | ||
63 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` | ||
64 | @@ -66,16 +52,12 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], | ||
65 | |||
66 | AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], | ||
67 | [ | ||
68 | - if test -z "$use_gpgrt_config"; then | ||
69 | - gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` | ||
70 | - else | ||
71 | - gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none` | ||
72 | - fi | ||
73 | + gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` | ||
74 | if test x"$gpgme_config_host" != xnone ; then | ||
75 | if test x"$gpgme_config_host" != x"$host" ; then | ||
76 | AC_MSG_WARN([[ | ||
77 | *** | ||
78 | -*** The config script "$GPGME_CONFIG" was | ||
79 | +*** The config script $GPGME_CONFIG was | ||
80 | *** built for $gpgme_config_host and thus may not match the | ||
81 | *** used host $host. | ||
82 | *** You may want to use the configure option --with-gpgme-prefix | ||
83 | @@ -136,11 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], | ||
84 | # If we have a recent GPGME, we should also check that the | ||
85 | # API is compatible. | ||
86 | if test "$req_gpgme_api" -gt 0 ; then | ||
87 | - if test -z "$use_gpgrt_config"; then | ||
88 | - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | ||
89 | - else | ||
90 | - tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` | ||
91 | - fi | ||
92 | + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | ||
93 | if test "$tmp" -gt 0 ; then | ||
94 | if test "$req_gpgme_api" -ne "$tmp" ; then | ||
95 | ok=no | ||
96 | @@ -280,11 +258,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | ||
97 | # If we have a recent GPGME, we should also check that the | ||
98 | # API is compatible. | ||
99 | if test "$req_gpgme_api" -gt 0 ; then | ||
100 | - if test -z "$use_gpgrt_config"; then | ||
101 | - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | ||
102 | - else | ||
103 | - tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` | ||
104 | - fi | ||
105 | + tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | ||
106 | if test "$tmp" -gt 0 ; then | ||
107 | if test "$req_gpgme_api" -ne "$tmp" ; then | ||
108 | ok=no | ||
109 | @@ -293,20 +267,8 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | ||
110 | fi | ||
111 | fi | ||
112 | if test $ok = yes; then | ||
113 | - if test -z "$use_gpgrt_config"; then | ||
114 | - GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` | ||
115 | - GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` | ||
116 | - else | ||
117 | - if $GPGRT_CONFIG gpgme-glib --exists; then | ||
118 | - GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib" | ||
119 | - GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags` | ||
120 | - GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs` | ||
121 | - else | ||
122 | - ok = no | ||
123 | - fi | ||
124 | - fi | ||
125 | - fi | ||
126 | - if test $ok = yes; then | ||
127 | + GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` | ||
128 | + GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` | ||
129 | AC_MSG_RESULT(yes) | ||
130 | ifelse([$2], , :, [$2]) | ||
131 | _AM_PATH_GPGME_CONFIG_HOST_CHECK | ||
132 | -- | ||
133 | 2.7.4 | ||
134 | |||