diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 72 |
1 files changed, 30 insertions, 42 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 176723cd16..827d95a151 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6492c952d61bb93a8bf8200c093d7e491456aa5a Mon Sep 17 00:00:00 2001 | 1 | From 98ce65902b197faa8f660564613ca2e504c2f8f8 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, 29 Jun 2018 14:35:41 +0800 | 3 | Date: Fri, 10 May 2019 14:23:55 +0800 |
4 | Subject: [PATCH 1/7] pkgconfig | 4 | Subject: [PATCH] pkgconfig |
5 | 5 | ||
6 | Update gpgme to use pkgconfig instead of -config files since its | 6 | Update gpgme to use pkgconfig instead of -config files since its |
7 | simpler and less error prone when cross compiling. | 7 | simpler and less error prone when cross compiling. |
@@ -11,7 +11,7 @@ RP 2015/4/17 | |||
11 | 11 | ||
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.11.1 | 14 | Rebase to 1.13.0 |
15 | 15 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
17 | --- | 17 | --- |
@@ -19,43 +19,40 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | src/Makefile.am | 4 +- | 19 | src/Makefile.am | 4 +- |
20 | src/gpgme-pthread.pc.in | 15 +++++++ | 20 | src/gpgme-pthread.pc.in | 15 +++++++ |
21 | src/gpgme.m4 | 114 ++++-------------------------------------------- | 21 | src/gpgme.m4 | 114 ++++-------------------------------------------- |
22 | src/gpgme.pc.in | 15 +++++++ | 22 | src/gpgme.pc.in | 4 +- |
23 | 5 files changed, 42 insertions(+), 107 deletions(-) | 23 | 5 files changed, 28 insertions(+), 110 deletions(-) |
24 | create mode 100644 src/gpgme-pthread.pc.in | 24 | create mode 100644 src/gpgme-pthread.pc.in |
25 | create mode 100644 src/gpgme.pc.in | ||
26 | 25 | ||
27 | diff --git a/configure.ac b/configure.ac | 26 | diff --git a/configure.ac b/configure.ac |
28 | index af569ac..865bd10 100644 | 27 | index 25184f4..1c0a386 100644 |
29 | --- a/configure.ac | 28 | --- a/configure.ac |
30 | +++ b/configure.ac | 29 | +++ b/configure.ac |
31 | @@ -895,6 +895,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 30 | @@ -899,6 +899,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
32 | src/versioninfo.rc | 31 | src/gpgme-glib.pc |
33 | src/gpgme.h) | 32 | src/gpgme.h) |
34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 33 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
35 | +AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) | 34 | +AC_CONFIG_FILES(src/gpgme-pthread.pc) |
36 | AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) | 35 | AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile) |
36 | AC_CONFIG_FILES(lang/cpp/tests/Makefile) | ||
37 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) | 37 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in) |
38 | AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in) | ||
39 | diff --git a/src/Makefile.am b/src/Makefile.am | 38 | diff --git a/src/Makefile.am b/src/Makefile.am |
40 | index 1394c02..8451c3a 100644 | 39 | index d85a85c..d942f3e 100644 |
41 | --- a/src/Makefile.am | 40 | --- a/src/Makefile.am |
42 | +++ b/src/Makefile.am | 41 | +++ b/src/Makefile.am |
43 | @@ -19,12 +19,14 @@ | 42 | @@ -20,11 +20,11 @@ |
44 | ## Process this file with automake to produce Makefile.in | 43 | ## Process this file with automake to produce Makefile.in |
45 | 44 | ||
45 | pkgconfigdir = $(libdir)/pkgconfig | ||
46 | -pkgconfig_DATA = gpgme.pc gpgme-glib.pc | ||
47 | +pkgconfig_DATA = gpgme.pc gpgme-glib.pc gpgme-pthread.pc | ||
48 | |||
46 | EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ | 49 | EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ |
47 | - gpgme.h.in versioninfo.rc.in gpgme.def | 50 | gpgme.h.in versioninfo.rc.in gpgme.def \ |
48 | + gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in gpgme-pthread.pc.in | 51 | - gpgme.pc.in gpgme-glib.pc.in |
52 | + gpgme.pc.in gpgme-glib.pc.in gpgme-pthread.pc.in | ||
49 | 53 | ||
50 | bin_SCRIPTS = gpgme-config | 54 | bin_SCRIPTS = gpgme-config |
51 | m4datadir = $(datadir)/aclocal | 55 | m4datadir = $(datadir)/aclocal |
52 | m4data_DATA = gpgme.m4 | ||
53 | nodist_include_HEADERS = gpgme.h | ||
54 | +pkgconfigdir = $(libdir)/pkgconfig | ||
55 | +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc | ||
56 | |||
57 | bin_PROGRAMS = gpgme-tool gpgme-json | ||
58 | |||
59 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in | 56 | diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in |
60 | new file mode 100644 | 57 | new file mode 100644 |
61 | index 0000000..074bbf6 | 58 | index 0000000..074bbf6 |
@@ -277,27 +274,18 @@ index 6c2be44..d8a75cb 100644 | |||
277 | - AC_SUBST(GPGME_GLIB_LIBS) | 274 | - AC_SUBST(GPGME_GLIB_LIBS) |
278 | ]) | 275 | ]) |
279 | diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in | 276 | diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in |
280 | new file mode 100644 | 277 | index be288b8..16f56ac 100644 |
281 | index 0000000..b69539f | 278 | --- a/src/gpgme.pc.in |
282 | --- /dev/null | ||
283 | +++ b/src/gpgme.pc.in | 279 | +++ b/src/gpgme.pc.in |
284 | @@ -0,0 +1,15 @@ | 280 | @@ -9,6 +9,6 @@ Name: gpgme |
285 | +prefix=@prefix@ | 281 | Description: GnuPG Made Easy to access GnuPG |
286 | +exec_prefix=@exec_prefix@ | 282 | Requires: gpg-error, libassuan |
287 | +libdir=@libdir@ | 283 | Version: @PACKAGE_VERSION@ |
288 | +includedir=@includedir@ | 284 | -Cflags: @GPGME_CONFIG_CFLAGS@ |
289 | + | 285 | -Libs: @GPGME_CONFIG_LIBS@ |
290 | +# API info | ||
291 | +api_version=@GPGME_CONFIG_API_VERSION@ | ||
292 | +host=@GPGME_CONFIG_HOST@ | ||
293 | + | ||
294 | +Name: gpgme | ||
295 | +Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program. | ||
296 | +Version: @VERSION@ | ||
297 | +Libs: -L${libdir} -lgpgme | ||
298 | +Cflags: -I${includedir} | 286 | +Cflags: -I${includedir} |
299 | +Requires: libassuan gpg-error | 287 | +Libs: -L${libdir} -lgpgme |
300 | \ No newline at end of file | 288 | URL: https://www.gnupg.org/software/gpgme/index.html |
301 | -- | 289 | -- |
302 | 2.7.4 | 290 | 2.7.4 |
303 | 291 | ||