diff --git a/bugfix-corss-build-detec-hosts-objdump.patch b/bugfix-corss-build-detec-hosts-objdump.patch new file mode 100644 index 0000000000000000000000000000000000000000..6d5eef2f1a442929035db7893da91661747de9df --- /dev/null +++ b/bugfix-corss-build-detec-hosts-objdump.patch @@ -0,0 +1,54 @@ +From ce97528fa3dcc58d86e18d4d8820f210a624f63d Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Thu, 11 Jun 2020 10:19:15 +0900 +Subject: [PATCH] build: On cross build, detect host's objdump. + +* configure.ac [*-*-linux*] (CROSS_HOST_OBJDUMP): New. + +-- + +To support widely, we could also use objdump configured for multiple +archs which supports host's format (instead of $host_alias-objdump), +like objdump in binutils-multiarch of Debian, but it's not that easy +to maintain the code to determine format name from $host_alias. + +Or we could use eu-size in elfutils. + +GnuPG-bug-id: 4973 +Signed-off-by: NIIBE Yutaka +--- + configure.ac | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1dd6489..d5fa4b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -597,14 +597,19 @@ fi + if test x$cross_compiling = xyes; then + case $host in + *-*-linux*) +- lock_obj_h_generated=yes +- mkdir src +- LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ +- CC=$CC OBJDUMP=$host_alias-objdump \ +- ac_ext=$ac_ext ac_objext=$ac_objext \ +- AWK=$AWK $srcdir/src/gen-lock-obj.sh \ +- >src/lock-obj-pub.native.h +- AC_MSG_NOTICE([generated src/lock-obj-pub.native.h]) ++ AC_CHECK_PROG(CROSS_HOST_OBJDUMP, [$host_alias-objdump], [yes]) ++ if test "$CROSS_HOST_OBJDUMP" = "yes" ; then ++ lock_obj_h_generated=yes ++ if test ! -d src; then mkdir src; fi ++ LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ ++ CC=$CC OBJDUMP=$host_alias-objdump \ ++ ac_ext=$ac_ext ac_objext=$ac_objext \ ++ AWK=$AWK $srcdir/src/gen-lock-obj.sh \ ++ >src/lock-obj-pub.native.h ++ AC_MSG_NOTICE([generated src/lock-obj-pub.native.h using $host_alias-objdump and $AWK]) ++ else ++ force_use_syscfg=yes ++ fi + ;; + *) + force_use_syscfg=yes diff --git a/bugfix-corss-build-into-a-seperate-build-dir.patch b/bugfix-corss-build-into-a-seperate-build-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f40bbc5e38fbbf8a562e7e05f945202de1d7306 --- /dev/null +++ b/bugfix-corss-build-into-a-seperate-build-dir.patch @@ -0,0 +1,41 @@ +From 013720333c6ec1d38791689bc49ba039d98e16b3 Mon Sep 17 00:00:00 2001 +From: David Michael +Date: Mon, 1 Jun 2020 10:24:53 -0400 +Subject: [PATCH] build: Fix cross-compiling into a separate build dir. + +* configure.ac: Create the src directory before writing into it. +* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. + +-- + +Signed-off-by: David Michael +--- + configure.ac | 1 + + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6bd634b..1dd6489 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then + case $host in + *-*-linux*) + lock_obj_h_generated=yes ++ mkdir src + LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ + CC=$CC OBJDUMP=$host_alias-objdump \ + ac_ext=$ac_ext ac_objext=$ac_objext \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 7e36d69..b2bffd2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ + gpg-error.vers gpg-error.def.in \ + versioninfo.rc.in gpg-error.w32-manifest.in \ + gpg-error-config-test.sh gpg-error.pc.in \ +- $(lock_obj_pub) ++ gen-lock-obj.sh $(lock_obj_pub) + + BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ + code-to-errno.h code-from-errno.h \ diff --git a/libgpg-error-1.37.tar.gz b/libgpg-error-1.37.tar.gz deleted file mode 100644 index 23a2a1a9e45ef9b72e3f7e463dc7ea5f4fa131c1..0000000000000000000000000000000000000000 Binary files a/libgpg-error-1.37.tar.gz and /dev/null differ diff --git a/libgpg-error-1.37.tar.gz.sig b/libgpg-error-1.37.tar.gz.sig deleted file mode 100644 index 52de5e51a90e0f9cf48892d1720e73040b3eb1f8..0000000000000000000000000000000000000000 Binary files a/libgpg-error-1.37.tar.gz.sig and /dev/null differ diff --git a/libgpg-error-1.38.tar.gz b/libgpg-error-1.38.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f90d577c6de5e8a26bb73cc541e464a80c2334d5 Binary files /dev/null and b/libgpg-error-1.38.tar.gz differ diff --git a/libgpg-error-1.38.tar.gz.sig b/libgpg-error-1.38.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..91d9a2e6321d8f077e925fc127b11ed6e278193c Binary files /dev/null and b/libgpg-error-1.38.tar.gz.sig differ diff --git a/libgpg-error.spec b/libgpg-error.spec index d6bfa9de635e043ca1ef4ec680234374d1519e60..a49e15c3d1e144f521cac5b2565b9bd383905f9e 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,5 +1,5 @@ Name: libgpg-error -Version: 1.37 +Version: 1.38 Release: 1 Summary: Library for common error values and messages in GnuPG components. License: LGPLv2+ @@ -8,6 +8,8 @@ Source0: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version} Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig Patch6000: libgpg-error-1.29-multilib.patch +Patch6001: bugfix-corss-build-into-a-seperate-build-dir.patch +Patch6002: bugfix-corss-build-detec-hosts-objdump.patch BuildRequires: gcc gawk, gettext, autoconf, automake, gettext-devel, libtool, texinfo, gettext-autopoint hostname @@ -83,6 +85,12 @@ exit 0 %{_mandir}/* %changelog +* Sat Aug 29 2020 xiaqirong - 1.38-1 +- Type:bugfix +- Id:NA +- SUG:NA +- update to 1.38 + * Wed Apr 15 2020 songnannan - 1.37-1 - Type:bugfix - Id:NA