diff options
Diffstat (limited to 'dev-libs/libgpg-error/files')
| -rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch | 40 | ||||
| -rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch | 32 | ||||
| -rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch (renamed from dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch) | 8 | ||||
| -rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch | 20 |
4 files changed, 24 insertions, 76 deletions
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch deleted file mode 100644 index 7ddd51f9a57b..000000000000 --- a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: David Michael <fedora.dm0@gmail.com> -Date: Mon, 1 Jun 2020 14:24:53 +0000 (-0400) -Subject: build: Fix cross-compiling into a separate build dir. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3 - -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> ---- - -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/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch deleted file mode 100644 index 78d98dd7b3d1..000000000000 --- a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001 -From: David Michael <fedora.dm0@gmail.com> -Date: Fri, 26 Mar 2021 16:06:50 +0900 -Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross - build. - -* src/gen-lock-obj.sh: Capture echo output with quotes. - --- - -Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 -Signed-off-by: David Michael <fedora.dm0@gmail.com> ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index a710f0c..258eec6 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else --- -2.11.0 - diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch index 2919a9d73be0..043099c097bd 100644 --- a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch +++ b/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch @@ -3,12 +3,12 @@ This breaks our multilib builds: Confirm gpg-error-config works... no *** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log ---- libgpg-error-1.37/src/Makefile.am -+++ libgpg-error-1.37/src/Makefile.am -@@ -338,14 +338,6 @@ +--- libgpg-error-1.44/src/Makefile.am ++++ libgpg-error-1.44/src/Makefile.am +@@ -347,14 +347,6 @@ cp gpg-error.h gpgrt.h - gpg-error-config: gpgrt-config gpg-error-config-old + gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh - @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" - @if ./gpg-error-config-test.sh --old-new; then \ - echo "good"; \ diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch new file mode 100644 index 000000000000..7ccdb2223a57 --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch @@ -0,0 +1,20 @@ +This breaks our multilib builds: + + Confirm gpg-error-config works... no + *** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -318,12 +318,4 @@ gpgrt.h: gpg-error.h + cp gpg-error.h gpgrt.h + + gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh +- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" +- @if ./gpg-error-config-test.sh --old-new; then \ +- echo "good"; \ +- else \ +- echo "no"; \ +- echo "*** Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \ +- exit 1; \ +- fi + cp gpg-error-config-old $@ |