From 4a59b8a3d81ce6391da59f0aced763d0c16f73eb Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 4 Apr 2018 02:00:03 -0400 Subject: libgpg-error: 1.27 -> 1.28 - Rebase pkgconfig.patch - Fix regression on arm64 due to invalid use of va_list License-Update: copyright years Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- ...gression-on-arm64-due-to-invalid-use-of-v.patch | 61 ++++++++++++++++++++ .../libgpg-error/libgpg-error/pkgconfig.patch | 67 +++++++++++++--------- .../libgpg-error/libgpg-error_1.27.bb | 62 -------------------- .../libgpg-error/libgpg-error_1.28.bb | 63 ++++++++++++++++++++ 4 files changed, 165 insertions(+), 88 deletions(-) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.27.bb create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.28.bb (limited to 'meta/recipes-support/libgpg-error') diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch new file mode 100644 index 0000000000..c35e7240b4 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch @@ -0,0 +1,61 @@ +From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Sun, 18 Mar 2018 17:39:43 +0100 +Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. + +* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of +NULL. +-- + +Fix +Suggested-by: Jakub Wilk + +Signed-off-by: Werner Koch + +Upstream-Status: Backport + +Signed-off-by: Hongxu Jia + +--- + src/logging.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/src/logging.c b/src/logging.c +index 1a4f620..d01f974 100644 +--- a/src/logging.c ++++ b/src/logging.c +@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) + + + /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print +- * just the raw dump, with FMT being an empty string, print a trailing +- * linefeed, otherwise print an entire debug line with the expanded +- * FMT followed by a possible wrapped hexdump and a final LF. */ ++ * just the raw dump (in this case ARG_PTR is not used), with FMT ++ * being an empty string, print a trailing linefeed, otherwise print ++ * an entire debug line with the expanded FMT followed by a possible ++ * wrapped hexdump and a final LF. */ + void + _gpgrt_logv_printhex (const void *buffer, size_t length, + const char *fmt, va_list arg_ptr) +@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, + va_end (arg_ptr); + } + else +- _gpgrt_logv_printhex (buffer, length, NULL, NULL); ++ { ++ /* va_list is not necessary a pointer and thus we can't use NULL ++ * because that would conflict with platforms using a straight ++ * struct for it (e.g. arm64). We use a dummy variable instead; ++ * the static is a simple way zero it out so to not get ++ * complains about uninitialized use. */ ++ static va_list dummy_argptr; ++ ++ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); ++ } + } + + +-- +2.7.4 + 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 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 29 Mar 2018 15:12:17 +0800 +Subject: [PATCH] support pkgconfig Upstream-Status: Pending -Index: libgpg-error-1.17/configure.ac -=================================================================== ---- libgpg-error-1.17.orig/configure.ac -+++ libgpg-error-1.17/configure.ac -@@ -529,6 +529,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make +Rebase to 1.28 + +Signed-off-by: Hongxu Jia +--- + configure.ac | 1 + + src/Makefile.am | 4 ++- + src/gpg-error.m4 | 71 +++-------------------------------------------------- + src/gpg-error.pc.in | 11 +++++++++ + 4 files changed, 18 insertions(+), 69 deletions(-) + create mode 100644 src/gpg-error.pc.in + +diff --git a/configure.ac b/configure.ac +index aca9300..f7794e9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -621,6 +621,7 @@ AC_CONFIG_FILES([src/Makefile tests/Makefile]) AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd]) AC_CONFIG_FILES([src/versioninfo.rc src/gpg-error.w32-manifest]) AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) @@ -17,33 +28,33 @@ Index: libgpg-error-1.17/configure.ac AC_OUTPUT -Index: libgpg-error-1.17/src/Makefile.am -=================================================================== ---- libgpg-error-1.17.orig/src/Makefile.am -+++ libgpg-error-1.17/src/Makefile.am -@@ -75,6 +75,8 @@ nodist_include_HEADERS = gpg-error.h - bin_SCRIPTS = gpg-error-config +diff --git a/src/Makefile.am b/src/Makefile.am +index 268c2ab..95f8459 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -87,6 +87,8 @@ bin_SCRIPTS = gpg-error-config + nodist_bin_SCRIPTS = gpgrt-config m4datadir = $(datadir)/aclocal - m4data_DATA = gpg-error.m4 + m4data_DATA = gpg-error.m4 gpgrt.m4 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gpg-error.pc EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ -@@ -82,7 +84,7 @@ EXTRA_DIST = mkstrtable.awk err-sources. +@@ -94,7 +96,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ 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 \ + err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 gpgrt.m4 \ 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.m4 -=================================================================== ---- libgpg-error-1.17.orig/src/gpg-error.m4 -+++ libgpg-error-1.17/src/gpg-error.m4 -@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa +diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 +index 60c88d8..2ef7e3e 100644 +--- a/src/gpg-error.m4 ++++ b/src/gpg-error.m4 +@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) @@ -132,10 +143,11 @@ 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 -=================================================================== +diff --git a/src/gpg-error.pc.in b/src/gpg-error.pc.in +new file mode 100644 +index 0000000..bc0b174 --- /dev/null -+++ libgpg-error-1.17/src/gpg-error.pc.in ++++ b/src/gpg-error.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -148,3 +160,6 @@ Index: libgpg-error-1.17/src/gpg-error.pc.in +Version: @VERSION@ +Libs: -L${libdir} -lgpg-error +Cflags: -I${includedir} +-- +1.8.3.1 + diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb deleted file mode 100644 index b74f079f5d..0000000000 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb +++ /dev/null @@ -1,62 +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=beae1e44d8d5c265d194760276033a7c \ - file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" - - -SECTION = "libs" - -UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" -SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "5217ef3e76a7275a2a3b569a12ddc989" -SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2" - -BINCONFIG = "${bindir}/gpg-error-config" - -inherit autotools binconfig-disabled pkgconfig gettext multilib_header -CPPFLAGS += "-P" -do_compile_prepend() { - TARGET_FILE=linux-gnu - if [ ${TARGET_OS} = "mingw32" ]; then - # There are no arch specific syscfg files for mingw32 - TARGET_FILE= - elif [ ${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 ;; - mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; - mips*el) TUPLE=mipsel-unknown-linux-gnu ;; - mips*) TUPLE=mips-unknown-linux-gnu ;; - x86_64) TUPLE=x86_64-pc-linux-gnu ;; - *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; - esac - - if [ -n "$TARGET_FILE" ]; then - cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ - ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h - fi -} - -do_install_append() { - # we don't have common lisp in OE - rm -rf "${D}${datadir}/common-lisp/" - oe_multilib_header gpg-error.h gpgrt.h -} - -FILES_${PN}-dev += "${bindir}/gpg-error" -FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb new file mode 100644 index 0000000000..71f4c3a388 --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.28.bb @@ -0,0 +1,63 @@ +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=fc7423b56d5f7163a9a2acf9fe2f8d6b \ + file://src/init.c;endline=20;md5=872b2389fe9bae7ffb80d2b91225afbc" + + +SECTION = "libs" + +UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" +SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ + file://pkgconfig.patch \ + file://0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch \ + " + +SRC_URI[md5sum] = "2b072f6194eb22d48cd4c7c77e59b5af" +SRC_URI[sha256sum] = "3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49" + +BINCONFIG = "${bindir}/gpg-error-config" + +inherit autotools binconfig-disabled pkgconfig gettext multilib_header +CPPFLAGS += "-P" +do_compile_prepend() { + TARGET_FILE=linux-gnu + if [ ${TARGET_OS} = "mingw32" ]; then + # There are no arch specific syscfg files for mingw32 + TARGET_FILE= + elif [ ${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 ;; + mips64*) TUPLE=mips64el-unknown-linux-gnuabi64 ;; + mips*el) TUPLE=mipsel-unknown-linux-gnu ;; + mips*) TUPLE=mips-unknown-linux-gnu ;; + x86_64) TUPLE=x86_64-pc-linux-gnu ;; + *) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;; + esac + + if [ -n "$TARGET_FILE" ]; then + cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \ + ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h + fi +} + +do_install_append() { + # we don't have common lisp in OE + rm -rf "${D}${datadir}/common-lisp/" + oe_multilib_header gpg-error.h gpgrt.h +} + +FILES_${PN}-dev += "${bindir}/gpg-error" +FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg