summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-22 10:49:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-28 08:27:00 +0100
commit55d0ae691dce48e9d2cb036ec370a79234cf39af (patch)
treedd4f74427bb127bc7b648db56da12c5b700205c5 /meta
parentcd7b437d4b6800aab47ea9d9b00bbac1bb270bc5 (diff)
downloadpoky-55d0ae691dce48e9d2cb036ec370a79234cf39af.tar.gz
libgpg-error: Extend pkgconfig support to m4 macros
Whilst there is currently .pc file pkgconfig support, it was unused by the m4 macros. This extends the support so they're used instead of the -config scripts. (From OE-Core rev: ff573270f7e87296840911189fd2087a1bc597f7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch103
1 files changed, 90 insertions, 13 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
index 27640129e2..2a2c1e9c21 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
@@ -5,22 +5,22 @@
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Index: libgpg-error-1.8/configure.ac 8Index: libgpg-error-1.12/configure.ac
9=================================================================== 9===================================================================
10--- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700 10--- libgpg-error-1.12.orig/configure.ac 2014-05-13 21:14:26.846393236 +0000
11+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700 11+++ libgpg-error-1.12/configure.ac 2014-05-13 21:14:26.926393236 +0000
12@@ -140,6 +140,7 @@ 12@@ -217,6 +217,7 @@
13 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) 13 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
14 AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER) 14 AC_CONFIG_FILES([src/versioninfo.rc])
15 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) 15 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
16+AC_CONFIG_FILES([src/gpg-error.pc]) 16+AC_CONFIG_FILES([src/gpg-error.pc])
17 17
18 AC_OUTPUT
18 19
19 # Special defines for certain platforms 20Index: libgpg-error-1.12/src/Makefile.am
20Index: libgpg-error-1.8/src/Makefile.am
21=================================================================== 21===================================================================
22--- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700 22--- libgpg-error-1.12.orig/src/Makefile.am 2014-05-13 21:14:26.846393236 +0000
23+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700 23+++ libgpg-error-1.12/src/Makefile.am 2014-05-13 21:14:26.934393236 +0000
24@@ -37,13 +37,15 @@ 24@@ -37,13 +37,15 @@
25 bin_SCRIPTS = gpg-error-config 25 bin_SCRIPTS = gpg-error-config
26 m4datadir = $(datadir)/aclocal 26 m4datadir = $(datadir)/aclocal
@@ -38,18 +38,95 @@ Index: libgpg-error-1.8/src/Makefile.am
38 38
39 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ 39 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
40 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \ 40 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \
41Index: libgpg-error-1.8/src/gpg-error.pc.in 41Index: libgpg-error-1.12/src/gpg-error.pc.in
42=================================================================== 42===================================================================
43--- /dev/null 1970-01-01 00:00:00.000000000 +0000 43--- /dev/null 1970-01-01 00:00:00.000000000 +0000
44+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700 44+++ libgpg-error-1.12/src/gpg-error.pc.in 2014-05-13 21:48:20.266382916 +0000
45@@ -0,0 +1,10 @@ 45@@ -0,0 +1,11 @@
46+prefix=@prefix@ 46+prefix=@prefix@
47+exec_prefix=@exec_prefix@ 47+exec_prefix=@exec_prefix@
48+libdir=@libdir@ 48+libdir=@libdir@
49+includedir=@includedir@ 49+includedir=@includedir@
50+host=@GPG_ERROR_CONFIG_HOST@
50+ 51+
51+Name: gpg-error 52+Name: gpg-error
52+Description: a library that defines common error values for all GnuPG components 53+Description: a library that defines common error values for all GnuPG components
53+Version: @VERSION@ 54+Version: @VERSION@
54+Libs: -L{libdir} -lgpg-error 55+Libs: -L{libdir} -lgpg-error
55+Cflags: -I${includedir} 56+Cflags: -I${includedir}
57Index: libgpg-error-1.12/src/gpg-error.m4
58===================================================================
59--- libgpg-error-1.12.orig/src/gpg-error.m4 2014-05-13 21:45:02.038383922 +0000
60+++ libgpg-error-1.12/src/gpg-error.m4 2014-05-13 21:47:08.362383281 +0000
61@@ -15,58 +15,14 @@
62 dnl
63 AC_DEFUN([AM_PATH_GPG_ERROR],
64 [ AC_REQUIRE([AC_CANONICAL_HOST])
65- gpg_error_config_prefix=""
66- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
67- dnl since that is consistent with how our three siblings use the directory/
68- dnl package name in --with-$dir_name-prefix=PFX.
69- AC_ARG_WITH(libgpg-error-prefix,
70- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
71- [prefix where GPG Error is installed (optional)]),
72- [gpg_error_config_prefix="$withval"])
73
74- dnl Accept --with-gpg-error-prefix and make it work the same as
75- dnl --with-libgpg-error-prefix above, for backwards compatibility,
76- dnl but do not document this old, inconsistently-named option.
77- AC_ARG_WITH(gpg-error-prefix,,
78- [gpg_error_config_prefix="$withval"])
79+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
80
81- if test x$gpg_error_config_prefix != x ; then
82- if test x${GPG_ERROR_CONFIG+set} != xset ; then
83- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
84- fi
85- fi
86+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
87
88- AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
89- min_gpg_error_version=ifelse([$1], ,0.0,$1)
90- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
91- ok=no
92- if test "$GPG_ERROR_CONFIG" != "no" \
93- && test -f "$GPG_ERROR_CONFIG" ; then
94- req_major=`echo $min_gpg_error_version | \
95- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
96- req_minor=`echo $min_gpg_error_version | \
97- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
98- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
99- major=`echo $gpg_error_config_version | \
100- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
101- minor=`echo $gpg_error_config_version | \
102- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
103- if test "$major" -gt "$req_major"; then
104- ok=yes
105- else
106- if test "$major" -eq "$req_major"; then
107- if test "$minor" -ge "$req_minor"; then
108- ok=yes
109- fi
110- fi
111- fi
112- fi
113 if test $ok = yes; then
114- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
115- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
116- AC_MSG_RESULT([yes ($gpg_error_config_version)])
117 ifelse([$2], , :, [$2])
118- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
119+ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error`
120 if test x"$gpg_error_config_host" != xnone ; then
121 if test x"$gpg_error_config_host" != x"$host" ; then
122 AC_MSG_WARN([[
123@@ -80,9 +36,6 @@
124 fi
125 fi
126 else
127- GPG_ERROR_CFLAGS=""
128- GPG_ERROR_LIBS=""
129- AC_MSG_RESULT(no)
130 ifelse([$3], , :, [$3])
131 fi
132 AC_SUBST(GPG_ERROR_CFLAGS)