commit: 8dc3f5d8f82efff45280659e5647c82e3ba6c969 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sat Nov 26 22:03:08 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Sat Nov 26 22:07:53 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc3f5d8
dev-libs/gmp: add upstream fix for USE=-asm builds dev-libs/gmp/files/gmp-6.1.0-udiv.patch | 61 +++++++++++++++++++++++++++++++++ dev-libs/gmp/gmp-6.1.0.ebuild | 1 + dev-libs/gmp/gmp-6.1.1.ebuild | 1 + 3 files changed, 63 insertions(+) diff --git a/dev-libs/gmp/files/gmp-6.1.0-udiv.patch b/dev-libs/gmp/files/gmp-6.1.0-udiv.patch new file mode 100644 index 00000000..3a6e807 --- /dev/null +++ b/dev-libs/gmp/files/gmp-6.1.0-udiv.patch @@ -0,0 +1,61 @@ +https://gmplib.org/list-archives/gmp-bugs/2016-November/004031.html + +From dadb1954c8305ea7c7d61d30f7c6338024702280 Mon Sep 17 00:00:00 2001 +From: Torbjorn Granlund <[email protected]> +Date: Sat, 26 Nov 2016 02:58:34 +0100 +Subject: [PATCH] Conditionalise udiv_w_sdiv inclusion on --enable-assembly. + +--- + configure.ac | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 689e137f24c2..66c8b057574f 100644 +--- a/configure ++++ b/configure +@@ -1269,7 +1269,9 @@ case $host in + AC_DEFINE(HAVE_HOST_CPU_FAMILY_power) + HAVE_HOST_CPU_FAMILY_power=1 + cclist="gcc" +- extra_functions="udiv_w_sdiv" ++ if test "$enable_assembly" = "yes" ; then ++ extra_functions="udiv_w_sdiv" ++ fi + path="power" + + # gcc 2.7.2 knows rios1, rios2, rsc +@@ -1306,7 +1308,9 @@ case $host in + gcc_cflags="$gcc_cflags $fomit_frame_pointer" + gcc_cflags_optlist="arch" + path="s390_32" +- extra_functions="udiv_w_sdiv" ++ if test "$enable_assembly" = "yes" ; then ++ extra_functions="udiv_w_sdiv" ++ fi + gcc_32_cflags_maybe="-m31" + + case $host_cpu in +@@ -1603,14 +1607,18 @@ case $host in + GMP_INCLUDE_MPN(vax/elf.m4) + gcc_cflags="$gcc_cflags $fomit_frame_pointer" + path="vax" +- extra_functions="udiv_w_sdiv" ++ if test "$enable_assembly" = "yes" ; then ++ extra_functions="udiv_w_sdiv" ++ fi + ;; + vax*-*-*) + # Default to aout conventions (i.e., no register prefix, '_' global prefix) + # + gcc_cflags="$gcc_cflags $fomit_frame_pointer" + path="vax" +- extra_functions="udiv_w_sdiv" ++ if test "$enable_assembly" = "yes" ; then ++ extra_functions="udiv_w_sdiv" ++ fi + ;; + + +-- +2.11.0.rc2 + diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild index c92ceca..a511af5 100644 --- a/dev-libs/gmp/gmp-6.1.0.ebuild +++ b/dev-libs/gmp/gmp-6.1.0.ebuild @@ -34,6 +34,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) src_prepare() { [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} + epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch # note: we cannot run autotools here as gcc depends on this package elibtoolize diff --git a/dev-libs/gmp/gmp-6.1.1.ebuild b/dev-libs/gmp/gmp-6.1.1.ebuild index 4de8a1d..adb201e 100644 --- a/dev-libs/gmp/gmp-6.1.1.ebuild +++ b/dev-libs/gmp/gmp-6.1.1.ebuild @@ -33,6 +33,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) src_prepare() { [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} + epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch # note: we cannot run autotools here as gcc depends on this package elibtoolize
