diff options
Diffstat (limited to 'dev-libs/libgpg-error')
-rw-r--r-- | dev-libs/libgpg-error/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch | 32 | ||||
-rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.41.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.42.ebuild (renamed from dev-libs/libgpg-error/libgpg-error-1.39.ebuild) | 11 |
5 files changed, 46 insertions, 7 deletions
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest index 3ae617ed7b4..26f4a58b082 100644 --- a/dev-libs/libgpg-error/Manifest +++ b/dev-libs/libgpg-error/Manifest @@ -1,4 +1,4 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de -DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5 +DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 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 new file mode 100644 index 00000000000..78d98dd7b3d --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch @@ -0,0 +1,32 @@ +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/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild index d37b93f1d19..e5d788d1421 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools libtool multilib-minimal toolchain-funcs prefix +inherit autotools multilib-minimal toolchain-funcs prefix DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2 LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild index c6202ddd30f..b83de2c2f4a 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools libtool multilib-minimal toolchain-funcs prefix +inherit autotools multilib-minimal toolchain-funcs prefix DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild index 548ddb2954c..3822446f6e8 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools libtool multilib-minimal toolchain-funcs prefix +inherit autotools multilib-minimal toolchain-funcs prefix DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" @@ -28,10 +28,17 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" + "${FILESDIR}/${P}-cross_compile.patch" ) src_prepare() { default + + if use prefix ; then + # don't hardcode /usr/xpg4/bin/sh as shell on Solaris + sed -i -e 's/solaris\*/disabled/' configure.ac || die + fi + # only necessary for as long as we run eautoreconf, configure.ac # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is # not a pure /bin/sh script, so it fails on some hosts |