diff options
Diffstat (limited to 'meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 67 |
1 files changed, 41 insertions, 26 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 9ffeedbe5a..3066613d42 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | |||
@@ -1,15 +1,26 @@ | |||
1 | 1 | From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 | |
2 | # | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 3 | Date: Thu, 29 Mar 2018 15:12:17 +0800 |
4 | # | 4 | Subject: [PATCH] support pkgconfig |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Index: libgpg-error-1.17/configure.ac | 8 | Rebase to 1.28 |
9 | =================================================================== | 9 | |
10 | --- libgpg-error-1.17.orig/configure.ac | 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
11 | +++ libgpg-error-1.17/configure.ac | 11 | --- |
12 | @@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make | 12 | configure.ac | 1 + |
13 | src/Makefile.am | 4 ++- | ||
14 | src/gpg-error.m4 | 71 +++-------------------------------------------------- | ||
15 | src/gpg-error.pc.in | 11 +++++++++ | ||
16 | 4 files changed, 18 insertions(+), 69 deletions(-) | ||
17 | create mode 100644 src/gpg-error.pc.in | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index aca9300..f7794e9 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) | ||
13 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) | 24 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) |
14 | AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) | 25 | AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) |
15 | AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) | 26 | AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) |
@@ -17,33 +28,33 @@ Index: libgpg-error-1.17/configure.ac | |||
17 | 28 | ||
18 | AC_OUTPUT | 29 | AC_OUTPUT |
19 | 30 | ||
20 | Index: libgpg-error-1.17/src/Makefile.am | 31 | diff --git a/src/Makefile.am b/src/Makefile.am |
21 | =================================================================== | 32 | index 268c2ab..95f8459 100644 |
22 | --- libgpg-error-1.17.orig/src/Makefile.am | 33 | --- a/src/Makefile.am |
23 | +++ libgpg-error-1.17/src/Makefile.am | 34 | +++ b/src/Makefile.am |
24 | @@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h | 35 | @@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config |
25 | bin_SCRIPTS = gpg-error-config | 36 | nodist_bin_SCRIPTS = gpgrt-config |
26 | m4datadir = $(datadir)/aclocal | 37 | m4datadir = $(datadir)/aclocal |
27 | m4data_DATA = gpg-error.m4 | 38 | m4data_DATA = gpg-error.m4 gpgrt.m4 |
28 | +pkgconfigdir = $(libdir)/pkgconfig | 39 | +pkgconfigdir = $(libdir)/pkgconfig |
29 | +pkgconfig_DATA = gpg-error.pc | 40 | +pkgconfig_DATA = gpg-error.pc |
30 | 41 | ||
31 | EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ | 42 | EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ |
32 | mkerrnos.awk errnos.in README \ | 43 | mkerrnos.awk errnos.in README \ |
33 | @@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. | 44 | @@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ |
34 | mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ | 45 | mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ |
35 | err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ | 46 | err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ |
36 | gpg-error.vers gpg-error.def.in \ | 47 | gpg-error.vers gpg-error.def.in \ |
37 | - versioninfo.rc.in gpg-error.w32-manifest.in \ | 48 | - versioninfo.rc.in gpg-error.w32-manifest.in \ |
38 | + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ | 49 | + versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ |
39 | $(lock_obj_pub) | 50 | $(lock_obj_pub) |
40 | 51 | ||
41 | BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ | 52 | BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ |
42 | Index: libgpg-error-1.17/src/gpg-error.m4 | 53 | diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 |
43 | =================================================================== | 54 | index 60c88d8..2ef7e3e 100644 |
44 | --- libgpg-error-1.17.orig/src/gpg-error.m4 | 55 | --- a/src/gpg-error.m4 |
45 | +++ libgpg-error-1.17/src/gpg-error.m4 | 56 | +++ b/src/gpg-error.m4 |
46 | @@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa | 57 | @@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. |
47 | dnl | 58 | dnl |
48 | AC_DEFUN([AM_PATH_GPG_ERROR], | 59 | AC_DEFUN([AM_PATH_GPG_ERROR], |
49 | [ AC_REQUIRE([AC_CANONICAL_HOST]) | 60 | [ AC_REQUIRE([AC_CANONICAL_HOST]) |
@@ -132,10 +143,11 @@ Index: libgpg-error-1.17/src/gpg-error.m4 | |||
132 | ifelse([$3], , :, [$3]) | 143 | ifelse([$3], , :, [$3]) |
133 | fi | 144 | fi |
134 | AC_SUBST(GPG_ERROR_CFLAGS) | 145 | AC_SUBST(GPG_ERROR_CFLAGS) |
135 | Index: libgpg-error-1.17/src/gpg-error.pc.in | 146 | diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in |
136 | =================================================================== | 147 | new file mode 100644 |
148 | index 0000000..bc0b174 | ||
137 | --- /dev/null | 149 | --- /dev/null |
138 | +++ libgpg-error-1.17/src/gpg-error.pc.in | 150 | +++ b/src/gpg-error.pc.in |
139 | @@ -0,0 +1,11 @@ | 151 | @@ -0,0 +1,11 @@ |
140 | +prefix=@prefix@ | 152 | +prefix=@prefix@ |
141 | +exec_prefix=@exec_prefix@ | 153 | +exec_prefix=@exec_prefix@ |
@@ -148,3 +160,6 @@ Index: libgpg-error-1.17/src/gpg-error.pc.in | |||
148 | +Version: @VERSION@ | 160 | +Version: @VERSION@ |
149 | +Libs: -L${libdir} -lgpg-error | 161 | +Libs: -L${libdir} -lgpg-error |
150 | +Cflags: -I${includedir} | 162 | +Cflags: -I${includedir} |
163 | -- | ||
164 | 1.8.3.1 | ||
165 | |||