diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-06-15 09:42:19 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-06-15 09:42:19 +0200 |
| commit | 264325d51d8a22582fd422019d476ff3e5074a24 (patch) | |
| tree | 05f8607250d4de3d193710696ba263cecfbd190d | |
| parent | dev-util/redo: Version 0.42c (diff) | |
| download | gentoo-264325d51d8a22582fd422019d476ff3e5074a24.tar.gz gentoo-264325d51d8a22582fd422019d476ff3e5074a24.tar.bz2 gentoo-264325d51d8a22582fd422019d476ff3e5074a24.zip | |
dev-libs/libgpg-error: Fixed build with cross-compile toolchain
Closes: https://bugs.gentoo.org/726520
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
| -rw-r--r-- | dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch | 40 | ||||
| -rw-r--r-- | dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 5 |
2 files changed, 44 insertions, 1 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 new file mode 100644 index 000000000000..7ddd51f9a57b --- /dev/null +++ b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch @@ -0,0 +1,40 @@ +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/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild index f6fa282fbe08..821a4bb59d43 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild @@ -26,7 +26,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gpgrt.h ) -PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" + "${FILESDIR}/${P}-cross_compile.patch" #726520 +) src_prepare() { default |