diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 92 |
1 files changed, 48 insertions, 44 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 827d95a151..831771ca2d 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 98ce65902b197faa8f660564613ca2e504c2f8f8 Mon Sep 17 00:00:00 2001 | 1 | From 7b3a00cb0fc27c896dd85c9afc474bd9c2aea30d Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Fri, 10 May 2019 14:23:55 +0800 | 3 | Date: Fri, 10 May 2019 14:23:55 +0800 |
4 | Subject: [PATCH] pkgconfig | 4 | Subject: [PATCH] pkgconfig |
@@ -12,22 +12,24 @@ RP 2015/4/17 | |||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
13 | 13 | ||
14 | Rebase to 1.13.0 | 14 | Rebase to 1.13.0 |
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
16 | Rebase to 1.17.0 | ||
17 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
18 | |||
17 | --- | 19 | --- |
18 | configure.ac | 1 + | 20 | configure.ac | 1 + |
19 | src/Makefile.am | 4 +- | 21 | src/Makefile.am | 4 +- |
20 | src/gpgme-pthread.pc.in | 15 +++++++ | 22 | src/gpgme-pthread.pc.in | 15 +++++ |
21 | src/gpgme.m4 | 114 ++++-------------------------------------------- | 23 | src/gpgme.m4 | 119 +++------------------------------------- |
22 | src/gpgme.pc.in | 4 +- | 24 | src/gpgme.pc.in | 4 +- |
23 | 5 files changed, 28 insertions(+), 110 deletions(-) | 25 | 5 files changed, 29 insertions(+), 114 deletions(-) |
24 | create mode 100644 src/gpgme-pthread.pc.in | 26 | create mode 100644 src/gpgme-pthread.pc.in |
25 | 27 | ||
26 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
27 | index 25184f4..1c0a386 100644 | 29 | index ae4c7da..df892c9 100644 |
28 | --- a/configure.ac | 30 | --- a/configure.ac |
29 | +++ b/configure.ac | 31 | +++ b/configure.ac |
30 | @@ -899,6 +899,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 32 | @@ -1112,6 +1112,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
31 | src/gpgme-glib.pc | 33 | src/gpgme-glib.pc |
32 | src/gpgme.h) | 34 | src/gpgme.h) |
33 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 35 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
@@ -36,7 +38,7 @@ index 25184f4..1c0a386 100644 | |||
36 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) | 38 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) |
37 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) | 39 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
38 | diff --git a/src/Makefile.am b/src/Makefile.am | 40 | diff --git a/src/Makefile.am b/src/Makefile.am |
39 | index d85a85c..d942f3e 100644 | 41 | index ca70950..bda5498 100644 |
40 | --- a/src/Makefile.am | 42 | --- a/src/Makefile.am |
41 | +++ b/src/Makefile.am | 43 | +++ b/src/Makefile.am |
42 | @@ -20,11 +20,11 @@ | 44 | @@ -20,11 +20,11 @@ |
@@ -51,8 +53,8 @@ index d85a85c..d942f3e 100644 | |||
51 | - gpgme.pc.in gpgme-glib.pc.in | 53 | - gpgme.pc.in gpgme-glib.pc.in |
52 | + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in | 54 | + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in |
53 | 55 | ||
54 | bin_SCRIPTS = gpgme-config | 56 | if USE_GPGRT_CONFIG |
55 | m4datadir = $(datadir)/aclocal | 57 | noinst_SCRIPTS = gpgme-config |
56 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in | 58 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in |
57 | new file mode 100644 | 59 | new file mode 100644 |
58 | index 0000000..074bbf6 | 60 | index 0000000..074bbf6 |
@@ -75,10 +77,10 @@ index 0000000..074bbf6 | |||
75 | +Cflags: -I${includedir} | 77 | +Cflags: -I${includedir} |
76 | +Requires: libassuan gpg-error | 78 | +Requires: libassuan gpg-error |
77 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 | 79 | diff --git a/src/gpgme.m4 b/src/gpgme.m4 |
78 | index 6c2be44..d8a75cb 100644 | 80 | index 8cc2898..0ff550e 100644 |
79 | --- a/src/gpgme.m4 | 81 | --- a/src/gpgme.m4 |
80 | +++ b/src/gpgme.m4 | 82 | +++ b/src/gpgme.m4 |
81 | @@ -79,7 +79,7 @@ dnl config script does not match the host specification the script | 83 | @@ -168,7 +168,7 @@ dnl config script does not match the host specification the script |
82 | dnl is added to the gpg_config_script_warn variable. | 84 | dnl is added to the gpg_config_script_warn variable. |
83 | dnl | 85 | dnl |
84 | AC_DEFUN([AM_PATH_GPGME], | 86 | AC_DEFUN([AM_PATH_GPGME], |
@@ -87,7 +89,7 @@ index 6c2be44..d8a75cb 100644 | |||
87 | tmp=ifelse([$1], ,1:0.4.2,$1) | 89 | tmp=ifelse([$1], ,1:0.4.2,$1) |
88 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | 90 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
89 | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | 91 | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
90 | @@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME], | 92 | @@ -178,36 +178,12 @@ AC_DEFUN([AM_PATH_GPGME], |
91 | min_gpgme_version="$tmp" | 93 | min_gpgme_version="$tmp" |
92 | fi | 94 | fi |
93 | 95 | ||
@@ -126,7 +128,7 @@ index 6c2be44..d8a75cb 100644 | |||
126 | if test "$tmp" -gt 0 ; then | 128 | if test "$tmp" -gt 0 ; then |
127 | if test "$req_gpgme_api" -ne "$tmp" ; then | 129 | if test "$req_gpgme_api" -ne "$tmp" ; then |
128 | ok=no | 130 | ok=no |
129 | @@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME], | 131 | @@ -216,19 +192,11 @@ AC_DEFUN([AM_PATH_GPGME], |
130 | fi | 132 | fi |
131 | fi | 133 | fi |
132 | if test $ok = yes; then | 134 | if test $ok = yes; then |
@@ -146,44 +148,45 @@ index 6c2be44..d8a75cb 100644 | |||
146 | ]) | 148 | ]) |
147 | 149 | ||
148 | dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, | 150 | dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, |
149 | @@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS | 151 | @@ -236,9 +204,8 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
152 | dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS | ||
150 | dnl and GPGME_PTHREAD_LIBS. | 153 | dnl and GPGME_PTHREAD_LIBS. |
151 | dnl | 154 | dnl |
152 | AC_DEFUN([AM_PATH_GPGME_PTHREAD], | 155 | -AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ |
153 | -[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl | 156 | - AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and GPGME_LIBS])dnl |
157 | - AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl | ||
158 | +AC_DEFUN([AM_PATH_GPGME_PTHREAD], | ||
154 | +[ | 159 | +[ |
155 | tmp=ifelse([$1], ,1:0.4.2,$1) | 160 | tmp=ifelse([$1], ,1:0.4.2,$1) |
156 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then | 161 | if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
157 | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` | 162 | req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
158 | @@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], | 163 | @@ -248,40 +215,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ |
159 | min_gpgme_version="$tmp" | 164 | min_gpgme_version="$tmp" |
160 | fi | 165 | fi |
161 | 166 | ||
162 | - AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) | 167 | - AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) |
163 | - ok=no | 168 | - ok=no |
164 | - if test "$GPGME_CONFIG" != "no" ; then | 169 | - if test "$GPGME_CONFIG" != "no" ; then |
165 | - if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then | 170 | - req_major=`echo $min_gpgme_version | \ |
166 | - req_major=`echo $min_gpgme_version | \ | ||
167 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` | 171 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
168 | - req_minor=`echo $min_gpgme_version | \ | 172 | - req_minor=`echo $min_gpgme_version | \ |
169 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` | 173 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
170 | - req_micro=`echo $min_gpgme_version | \ | 174 | - req_micro=`echo $min_gpgme_version | \ |
171 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` | 175 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
172 | - if test "$gpgme_version_major" -gt "$req_major"; then | 176 | - if test "$gpgme_version_major" -gt "$req_major"; then |
173 | - ok=yes | 177 | - ok=yes |
174 | - else | 178 | - else |
175 | - if test "$gpgme_version_major" -eq "$req_major"; then | 179 | - if test "$gpgme_version_major" -eq "$req_major"; then |
176 | - if test "$gpgme_version_minor" -gt "$req_minor"; then | 180 | - if test "$gpgme_version_minor" -gt "$req_minor"; then |
177 | - ok=yes | 181 | - ok=yes |
178 | - else | 182 | - else |
179 | - if test "$gpgme_version_minor" -eq "$req_minor"; then | 183 | - if test "$gpgme_version_minor" -eq "$req_minor"; then |
180 | - if test "$gpgme_version_micro" -ge "$req_micro"; then | 184 | - if test "$gpgme_version_micro" -ge "$req_micro"; then |
181 | - ok=yes | 185 | - ok=yes |
182 | - fi | 186 | - fi |
187 | - fi | ||
183 | - fi | 188 | - fi |
184 | - fi | ||
185 | - fi | 189 | - fi |
186 | - fi | ||
187 | - fi | 190 | - fi |
188 | - fi | 191 | - fi |
189 | + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) | 192 | + PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) |
@@ -191,17 +194,21 @@ index 6c2be44..d8a75cb 100644 | |||
191 | # If we have a recent GPGME, we should also check that the | 194 | # If we have a recent GPGME, we should also check that the |
192 | # API is compatible. | 195 | # API is compatible. |
193 | if test "$req_gpgme_api" -gt 0 ; then | 196 | if test "$req_gpgme_api" -gt 0 ; then |
194 | - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | 197 | - if test -z "$use_gpgrt_config"; then |
198 | - tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` | ||
199 | - else | ||
200 | - tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` | ||
201 | - fi | ||
195 | + tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` | 202 | + tmp=`$PKG_CONFIG --variable=api_version gpgme-pthread 2>/dev/null || echo 0` |
196 | if test "$tmp" -gt 0 ; then | 203 | if test "$tmp" -gt 0 ; then |
197 | if test "$req_gpgme_api" -ne "$tmp" ; then | 204 | if test "$req_gpgme_api" -ne "$tmp" ; then |
198 | ok=no | 205 | ok=no |
199 | @@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], | 206 | @@ -290,19 +229,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],[ |
200 | fi | 207 | fi |
201 | fi | 208 | fi |
202 | if test $ok = yes; then | 209 | if test $ok = yes; then |
203 | - GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` | 210 | - GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags` |
204 | - GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` | 211 | - GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs` |
205 | - AC_MSG_RESULT(yes) | 212 | - AC_MSG_RESULT(yes) |
206 | ifelse([$2], , :, [$2]) | 213 | ifelse([$2], , :, [$2]) |
207 | _AM_PATH_GPGME_CONFIG_HOST_CHECK | 214 | _AM_PATH_GPGME_CONFIG_HOST_CHECK |
@@ -216,7 +223,7 @@ index 6c2be44..d8a75cb 100644 | |||
216 | ]) | 223 | ]) |
217 | 224 | ||
218 | 225 | ||
219 | @@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | 226 | @@ -321,36 +252,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
220 | min_gpgme_version="$tmp" | 227 | min_gpgme_version="$tmp" |
221 | fi | 228 | fi |
222 | 229 | ||
@@ -255,7 +262,7 @@ index 6c2be44..d8a75cb 100644 | |||
255 | if test "$tmp" -gt 0 ; then | 262 | if test "$tmp" -gt 0 ; then |
256 | if test "$req_gpgme_api" -ne "$tmp" ; then | 263 | if test "$req_gpgme_api" -ne "$tmp" ; then |
257 | ok=no | 264 | ok=no |
258 | @@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], | 265 | @@ -359,17 +266,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
259 | fi | 266 | fi |
260 | fi | 267 | fi |
261 | if test $ok = yes; then | 268 | if test $ok = yes; then |
@@ -274,18 +281,15 @@ index 6c2be44..d8a75cb 100644 | |||
274 | - AC_SUBST(GPGME_GLIB_LIBS) | 281 | - AC_SUBST(GPGME_GLIB_LIBS) |
275 | ]) | 282 | ]) |
276 | diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in | 283 | diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in |
277 | index be288b8..16f56ac 100644 | 284 | index 9ddef5c..932645b 100644 |
278 | --- a/src/gpgme.pc.in | 285 | --- a/src/gpgme.pc.in |
279 | +++ b/src/gpgme.pc.in | 286 | +++ b/src/gpgme.pc.in |
280 | @@ -9,6 +9,6 @@ Name: gpgme | 287 | @@ -9,6 +9,6 @@ Name: gpgme |
281 | Description: GnuPG Made Easy to access GnuPG | 288 | Description: GnuPG Made Easy to access GnuPG |
282 | Requires: gpg-error, libassuan | 289 | Requires.private: gpg-error, libassuan |
283 | Version: @PACKAGE_VERSION@ | 290 | Version: @PACKAGE_VERSION@ |
284 | -Cflags: @GPGME_CONFIG_CFLAGS@ | 291 | -Cflags: @GPGME_CONFIG_CFLAGS@ |
285 | -Libs: @GPGME_CONFIG_LIBS@ | 292 | -Libs: @GPGME_CONFIG_LIBS@ |
286 | +Cflags: -I${includedir} | 293 | +Cflags: -I${includedir} |
287 | +Libs: -L${libdir} -lgpgme | 294 | +Libs: -L${libdir} -lgpgme |
288 | URL: https://www.gnupg.org/software/gpgme/index.html | 295 | URL: https://www.gnupg.org/software/gpgme/index.html |
289 | -- | ||
290 | 2.7.4 | ||
291 | |||