summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-15 17:37:04 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-07-15 20:53:53 +0200
commitf76c6c4cbef82098aedf583ac7f55f349844128a (patch)
treef84eb18f7e5d7b2046e36eab11a05853eebba668
parenta65aa161fcc3b4dccf2a08103b92e7f9fb20225d (diff)
downloadmeta-openembedded-f76c6c4cbef82098aedf583ac7f55f349844128a.tar.gz
libgpg-error: switch over to a bbappend
Updates meta-oe to libgpg-error 1.10. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch53
-rw-r--r--meta-oe/recipes-support/libgpg-error/libgpg-error_1.10.bbappend2
-rw-r--r--meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb26
3 files changed, 2 insertions, 79 deletions
diff --git a/meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch b/meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
deleted file mode 100644
index 49e47d874..000000000
--- a/meta-oe/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: libgpg-error-1.8/configure.ac
7===================================================================
8--- libgpg-error-1.8.orig/configure.ac 2010-05-06 06:01:08.000000000 -0700
9+++ libgpg-error-1.8/configure.ac 2010-07-21 02:20:20.923261305 -0700
10@@ -140,6 +140,7 @@
11 AC_SUBST(GPG_ERROR_CONFIG_CFLAGS)
12 AC_SUBST(GPG_ERROR_CONFIG_ISUBDIRAFTER)
13 AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
14+AC_CONFIG_FILES([src/gpg-error.pc])
15
16
17 # Special defines for certain platforms
18Index: libgpg-error-1.8/src/Makefile.am
19===================================================================
20--- libgpg-error-1.8.orig/src/Makefile.am 2010-04-14 02:16:44.000000000 -0700
21+++ libgpg-error-1.8/src/Makefile.am 2010-07-21 02:22:36.655012496 -0700
22@@ -37,13 +37,15 @@
23 bin_SCRIPTS = gpg-error-config
24 m4datadir = $(datadir)/aclocal
25 m4data_DATA = gpg-error.m4
26+pkgconfigdir = $(libdir)/pkgconfig
27+pkgconfig_DATA = gpg-error.pc
28
29 EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
30 mkerrnos.awk errnos.in README \
31 mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
32 mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
33 err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
34- gpg-error.def.in versioninfo.rc.in
35+ gpg-error.def.in versioninfo.rc.in gpg-error.pc.in
36
37 BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
38 err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \
39Index: libgpg-error-1.8/src/gpg-error.pc.in
40===================================================================
41--- /dev/null 1970-01-01 00:00:00.000000000 +0000
42+++ libgpg-error-1.8/src/gpg-error.pc.in 2010-07-21 02:20:20.923261305 -0700
43@@ -0,0 +1,10 @@
44+prefix=@prefix@
45+exec_prefix=@exec_prefix@
46+libdir=@libdir@
47+includedir=@includedir@
48+
49+Name: gpg-error
50+Description: a library that defines common error values for all GnuPG components
51+Version: @VERSION@
52+Libs: -L{libdir} -lgpg-error
53+Cflags: -I${includedir}
diff --git a/meta-oe/recipes-support/libgpg-error/libgpg-error_1.10.bbappend b/meta-oe/recipes-support/libgpg-error/libgpg-error_1.10.bbappend
new file mode 100644
index 000000000..d9172b491
--- /dev/null
+++ b/meta-oe/recipes-support/libgpg-error/libgpg-error_1.10.bbappend
@@ -0,0 +1,2 @@
1BBCLASSEXTEND = "native"
2
diff --git a/meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb b/meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb
deleted file mode 100644
index 321c7b8f0..000000000
--- a/meta-oe/recipes-support/libgpg-error/libgpg-error_1.8.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1DESCRIPTION = "a small library that defines common error values for all GnuPG components"
2HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
3BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
4
5BBCLASSEXTEND = "native"
6
7LICENSE = "GPLv2+ & LGPLv2.1+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
9 file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
10 file://src/gpg-error.h;endline=23;md5=83c16c8f5cea85affa1ff270a6f4fcff \
11 file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c"
12SRC_URI[md5sum] = "1d2005268a2f096db28cf9cf77b3229a"
13SRC_URI[sha256sum] = "bdfbf2677147239d2d26d4e37f44635d9fd97c133c9ef9fd9793a12a059508c5"
14
15SECTION = "libs"
16LICENSE = "GPLv2+ & LGPLv2.1+"
17PR = "r0"
18
19SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
20 file://pkgconfig.patch;"
21
22# move libgpg-error-config into -dev package
23FILES_${PN} = "${libdir}/lib*.so.*"
24FILES_${PN}-dev += "${bindir}/*"
25
26inherit autotools binconfig pkgconfig gettext