commit: 723ffbdf98c2d72dd9a2747c9abe9aa23c46e3ec Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Tue Jun 20 18:17:49 2017 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Jun 20 18:28:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723ffbdf
dev-libs/expat: Fix compilation (bug #622274) https://github.com/libexpat/libexpat/pull/49 https://github.com/libexpat/libexpat/issues/50 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-libs/expat/expat-2.2.1.ebuild | 9 +++++++- .../files/expat-2.2.1-getrandom-detection.patch | 24 ++++++++++++++++++++ dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 26 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild index c67a04109bc..123ec5b76b6 100644 --- a/dev-libs/expat/expat-2.2.1.ebuild +++ b/dev-libs/expat/expat-2.2.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils libtool multilib toolchain-funcs multilib-minimal +inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="http://expat.sourceforge.net/"; @@ -17,6 +17,13 @@ RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 DOCS=( AUTHORS Changes README ) +src_prepare() { + epatch "${FILESDIR}"/${P}-getrandom-detection.patch + epatch "${FILESDIR}"/${P}-posix-shell.patch + eapply_user + eautoreconf +} + multilib_src_configure() { local myconf="$(use_enable static-libs static)" diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch new file mode 100644 index 00000000000..eba004843db --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch @@ -0,0 +1,24 @@ +From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Sun, 18 Jun 2017 18:55:10 +0200 +Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian + GNU/kFreeBSD (#50) + +There is no such thing but we need to link (not just compile) to realize. +--- + expat/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/expat/configure.ac b/expat/configure.ac +index 1357c9a..444c002 100644 +--- a/expat/configure.ac ++++ b/expat/configure.ac +@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ + + + AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <stdlib.h> /* for NULL */ + #include <sys/random.h> + int main() { diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch new file mode 100644 index 00000000000..3f34d0d9853 --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch @@ -0,0 +1,26 @@ +From e5e25fac1698d9ea8dbb2e51c18d1072254b5f4b Mon Sep 17 00:00:00 2001 +From: spzeidler <[email protected]> +Date: Sun, 18 Jun 2017 14:30:22 +0200 +Subject: [PATCH] Fix sh syntax in configure.ac (#49) + +The old '==' sh-is-not-C issue +It doesn't matter in bash, but some other sh don't like it, so it's a portability issue +--- + expat/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/expat/configure.ac b/expat/configure.ac +index e48c32e..1357c9a 100644 +--- a/expat/configure.ac ++++ b/expat/configure.ac +@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context], + [Do not retain context around the current parse point]), + [enable_xml_context=${enableval}]) + AS_IF([test "x${enable_xml_context}" != "xno"], [ +- AS_IF([test "x${enable_xml_context}" == "xyes" \ +- -o "x${enable_xml_context}" == "x"], [ ++ AS_IF([test "x${enable_xml_context}" = "xyes" \ ++ -o "x${enable_xml_context}" = "x"], [ + enable_xml_context=1024 + ]) + AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}],
