!13 update to 1.38
Merge pull request !13 from xiaqirong/openEuler-20.03-LTS
This commit is contained in:
openeuler-ci-bot
Gitee
commit
ec87f0e2f2
54
bugfix-corss-build-detec-hosts-objdump.patch
Normal file
54
bugfix-corss-build-detec-hosts-objdump.patch
Normal file
@ -0,0 +1,54 @@
|
||||
From ce97528fa3dcc58d86e18d4d8820f210a624f63d Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
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 <gniibe@fsij.org>
|
||||
---
|
||||
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
|
||||
41
bugfix-corss-build-into-a-seperate-build-dir.patch
Normal file
41
bugfix-corss-build-into-a-seperate-build-dir.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 013720333c6ec1d38791689bc49ba039d98e16b3 Mon Sep 17 00:00:00 2001
|
||||
From: David Michael <fedora.dm0@gmail.com>
|
||||
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 <fedora.dm0@gmail.com>
|
||||
---
|
||||
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 \
|
||||
Binary file not shown.
Binary file not shown.
BIN
libgpg-error-1.38.tar.gz
Normal file
BIN
libgpg-error-1.38.tar.gz
Normal file
Binary file not shown.
BIN
libgpg-error-1.38.tar.gz.sig
Normal file
BIN
libgpg-error-1.38.tar.gz.sig
Normal file
Binary file not shown.
@ -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 <xiaqirong1@huawei.com> - 1.38-1
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- update to 1.38
|
||||
|
||||
* Wed Apr 15 2020 songnannan <songnannan2@huawei.com> - 1.37-1
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user