diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-10-28 13:24:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:35:12 +0000 |
commit | 9cfe52d36e874bba3f38c8cfc028864c212bbd7b (patch) | |
tree | e8471a645cff68056d169cf4b9866a282c333b3f /meta/recipes-support/libgpg-error/libgpg-error | |
parent | 1a3afca79d1760ea6c5d8f6928b4aacd35e6765e (diff) | |
download | poky-9cfe52d36e874bba3f38c8cfc028864c212bbd7b.tar.gz |
libgpg-error: Update to 1.17
Rebased the pkgconfig.patch
Added do_compile_prepend() copy an architecture specific header file.
(From OE-Core rev: f6866391934588136f6cfa2c58fb8593875eb6fd)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libgpg-error/libgpg-error')
-rw-r--r-- | meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch new file mode 100644 index 0000000000..96476badaa --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch | |||
@@ -0,0 +1,149 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: libgpg-error-1.17/configure.ac | ||
9 | =================================================================== | ||
10 | --- libgpg-error-1.17.orig/configure.ac | ||
11 | +++ libgpg-error-1.17/configure.ac | ||
12 | @@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make | ||
13 | AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) | ||
14 | AC_CONFIG_FILES([src/versioninfo.rc]) | ||
15 | AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) | ||
16 | +AC_CONFIG_FILES([src/gpg-error.pc]) | ||
17 | |||
18 | AC_OUTPUT | ||
19 | |||
20 | Index: libgpg-error-1.17/src/Makefile.am | ||
21 | =================================================================== | ||
22 | --- libgpg-error-1.17.orig/src/Makefile.am | ||
23 | +++ libgpg-error-1.17/src/Makefile.am | ||
24 | @@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h | ||
25 | bin_SCRIPTS = gpg-error-config | ||
26 | m4datadir = $(datadir)/aclocal | ||
27 | m4data_DATA = gpg-error.m4 | ||
28 | +pkgconfigdir = $(libdir)/pkgconfig | ||
29 | +pkgconfig_DATA = gpg-error.pc | ||
30 | |||
31 | EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ | ||
32 | mkerrnos.awk errnos.in README \ | ||
33 | mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ | ||
34 | 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 \ | ||
36 | - gpg-error.vers gpg-error.def.in versioninfo.rc.in \ | ||
37 | + gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ | ||
38 | $(lock_obj_pub) | ||
39 | |||
40 | BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ | ||
41 | Index: libgpg-error-1.17/src/gpg-error.pc.in | ||
42 | =================================================================== | ||
43 | --- /dev/null | ||
44 | +++ libgpg-error-1.17/src/gpg-error.pc.in | ||
45 | @@ -0,0 +1,11 @@ | ||
46 | +prefix=@prefix@ | ||
47 | +exec_prefix=@exec_prefix@ | ||
48 | +libdir=@libdir@ | ||
49 | +includedir=@includedir@ | ||
50 | +host=@GPG_ERROR_CONFIG_HOST@ | ||
51 | + | ||
52 | +Name: gpg-error | ||
53 | +Description: a library that defines common error values for all GnuPG components | ||
54 | +Version: @VERSION@ | ||
55 | +Libs: -L${libdir} -lgpg-error | ||
56 | +Cflags: -I${includedir} | ||
57 | Index: libgpg-error-1.17/src/gpg-error.m4 | ||
58 | =================================================================== | ||
59 | --- libgpg-error-1.17.orig/src/gpg-error.m4 | ||
60 | +++ libgpg-error-1.17/src/gpg-error.m4 | ||
61 | @@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa | ||
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}" = x ; then | ||
82 | - if test x"${gpg_error_config_prefix}" != x ; then | ||
83 | - GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" | ||
84 | - else | ||
85 | - case "${SYSROOT}" in | ||
86 | - /*) | ||
87 | - if test -x "${SYSROOT}/bin/gpg-error-config" ; then | ||
88 | - GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" | ||
89 | - fi | ||
90 | - ;; | ||
91 | - '') | ||
92 | - ;; | ||
93 | - *) | ||
94 | - AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) | ||
95 | - ;; | ||
96 | - esac | ||
97 | - fi | ||
98 | - fi | ||
99 | + PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no]) | ||
100 | |||
101 | - AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) | ||
102 | - min_gpg_error_version=ifelse([$1], ,0.0,$1) | ||
103 | - AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) | ||
104 | - ok=no | ||
105 | - if test "$GPG_ERROR_CONFIG" != "no" \ | ||
106 | - && test -f "$GPG_ERROR_CONFIG" ; then | ||
107 | - req_major=`echo $min_gpg_error_version | \ | ||
108 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` | ||
109 | - req_minor=`echo $min_gpg_error_version | \ | ||
110 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` | ||
111 | - gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` | ||
112 | - major=`echo $gpg_error_config_version | \ | ||
113 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` | ||
114 | - minor=`echo $gpg_error_config_version | \ | ||
115 | - sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` | ||
116 | - if test "$major" -gt "$req_major"; then | ||
117 | - ok=yes | ||
118 | - else | ||
119 | - if test "$major" -eq "$req_major"; then | ||
120 | - if test "$minor" -ge "$req_minor"; then | ||
121 | - ok=yes | ||
122 | - fi | ||
123 | - fi | ||
124 | - fi | ||
125 | - fi | ||
126 | if test $ok = yes; then | ||
127 | - GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` | ||
128 | - GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` | ||
129 | - GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` | ||
130 | - GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` | ||
131 | - AC_MSG_RESULT([yes ($gpg_error_config_version)]) | ||
132 | ifelse([$2], , :, [$2]) | ||
133 | - gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` | ||
134 | + gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error` | ||
135 | if test x"$gpg_error_config_host" != xnone ; then | ||
136 | if test x"$gpg_error_config_host" != x"$host" ; then | ||
137 | AC_MSG_WARN([[ | ||
138 | @@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR], | ||
139 | fi | ||
140 | fi | ||
141 | else | ||
142 | - GPG_ERROR_CFLAGS="" | ||
143 | - GPG_ERROR_LIBS="" | ||
144 | - GPG_ERROR_MT_CFLAGS="" | ||
145 | - GPG_ERROR_MT_LIBS="" | ||
146 | - AC_MSG_RESULT(no) | ||
147 | ifelse([$3], , :, [$3]) | ||
148 | fi | ||
149 | AC_SUBST(GPG_ERROR_CFLAGS) | ||