From c263dc742c0c4729be51dad8eefc0b2699b071d9 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 9 Jun 2015 12:36:52 +0000 Subject: libgpg-error: Upgrade 1.18 -> 1.19 The patch pkgconfig.patch has not being integrated into upstream repository, so rebasing it. Another change occurred inside the recipe, the TUPLE's name changed for i586/i686 target architectures. Signed-off-by: Leonardo Sandoval Signed-off-by: Ross Burton --- .../libgpg-error/libgpg-error/pkgconfig.patch | 45 +++++++++---------- .../libgpg-error/libgpg-error_1.18.bb | 51 ---------------------- .../libgpg-error/libgpg-error_1.19.bb | 51 ++++++++++++++++++++++ 3 files changed, 74 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.18.bb create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.19.bb (limited to 'meta/recipes-support/libgpg-error') diff --git a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch index 96476badaa..9ffeedbe5a 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch +++ b/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch @@ -9,9 +9,9 @@ Index: libgpg-error-1.17/configure.ac =================================================================== --- libgpg-error-1.17.orig/configure.ac +++ libgpg-error-1.17/configure.ac -@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make +@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) - AC_CONFIG_FILES([src/versioninfo.rc]) + AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) +AC_CONFIG_FILES([src/gpg-error.pc]) @@ -21,7 +21,7 @@ Index: libgpg-error-1.17/src/Makefile.am =================================================================== --- libgpg-error-1.17.orig/src/Makefile.am +++ libgpg-error-1.17/src/Makefile.am -@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h +@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 @@ -30,30 +30,15 @@ Index: libgpg-error-1.17/src/Makefile.am EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ - mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ +@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ -- gpg-error.vers gpg-error.def.in versioninfo.rc.in \ -+ gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \ + gpg-error.vers gpg-error.def.in \ +- versioninfo.rc.in gpg-error.w32-manifest.in \ ++ versioninfo.rc.in gpg-error.w32-manifest.in gpg-error.pc \ $(lock_obj_pub) BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ -Index: libgpg-error-1.17/src/gpg-error.pc.in -=================================================================== ---- /dev/null -+++ libgpg-error-1.17/src/gpg-error.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+host=@GPG_ERROR_CONFIG_HOST@ -+ -+Name: gpg-error -+Description: a library that defines common error values for all GnuPG components -+Version: @VERSION@ -+Libs: -L${libdir} -lgpg-error -+Cflags: -I${includedir} Index: libgpg-error-1.17/src/gpg-error.m4 =================================================================== --- libgpg-error-1.17.orig/src/gpg-error.m4 @@ -147,3 +132,19 @@ Index: libgpg-error-1.17/src/gpg-error.m4 ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) +Index: libgpg-error-1.17/src/gpg-error.pc.in +=================================================================== +--- /dev/null ++++ libgpg-error-1.17/src/gpg-error.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++host=@GPG_ERROR_CONFIG_HOST@ ++ ++Name: gpg-error ++Description: a library that defines common error values for all GnuPG components ++Version: @VERSION@ ++Libs: -L${libdir} -lgpg-error ++Cflags: -I${includedir} diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb deleted file mode 100644 index c9a47a3573..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.18.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Small library that defines common error values for all GnuPG components" -HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=8b204918f0ca707136394d8bb20c7ebc \ - file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" - - -SECTION = "libs" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch" -SRC_URI[md5sum] = "12312802d2065774b787cbfc22cc04e9" -SRC_URI[sha256sum] = "9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext -CPPFLAGS += "-P" -do_compile_prepend() { - TARGET_FILE=linux-gnu - if [ ${TARGET_OS} != "linux" ]; then - TARGET_FILE=${TARGET_OS} - fi - - case ${TARGET_ARCH} in - aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; - arm) TUPLE=arm-unknown-linux-gnueabi ;; - armeb) TUPLE=arm-unknown-linux-gnueabi ;; - i586|i686) TUPLE=i486-pc-linux-gnu ;; - mips64el) TUPLE=mipsel-unknown-linux-gnu ;; - mips64) TUPLE=mips-unknown-linux-gnu ;; - x86_64) TUPLE=x86_64-pc-linux-gnu ;; - *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; - esac - - cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ - ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h -} - -do_install_append() { - # we don't have common lisp in OE - rm -rf "${D}${datadir}/common-lisp/" -} - -FILES_${PN}-dev += "${bindir}/gpg-error" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb new file mode 100644 index 0000000000..39dbbcf337 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb @@ -0,0 +1,51 @@ +SUMMARY = "Small library that defines common error values for all GnuPG components" +HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://src/gpg-error.h.in;endline=23;md5=8b204918f0ca707136394d8bb20c7ebc \ + file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" + + +SECTION = "libs" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ + file://pkgconfig.patch" +SRC_URI[md5sum] = "c04c16245b92829281f43b5bef7d16da" +SRC_URI[sha256sum] = "53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext +CPPFLAGS += "-P" +do_compile_prepend() { + TARGET_FILE=linux-gnu + if [ ${TARGET_OS} != "linux" ]; then + TARGET_FILE=${TARGET_OS} + fi + + case ${TARGET_ARCH} in + aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;; + arm) TUPLE=arm-unknown-linux-gnueabi ;; + armeb) TUPLE=arm-unknown-linux-gnueabi ;; + i586|i686) TUPLE=i686-pc-linux-gnu ;; + mips64el) TUPLE=mipsel-unknown-linux-gnu ;; + mips64) TUPLE=mips-unknown-linux-gnu ;; + x86_64) TUPLE=x86_64-pc-linux-gnu ;; + *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; + esac + + cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ + ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h +} + +do_install_append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" +} + +FILES_${PN}-dev += "${bindir}/gpg-error" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg