| 1 |
commit: 8dc3f5d8f82efff45280659e5647c82e3ba6c969 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 22:03:08 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 22:07:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc3f5d8 |
| 7 |
|
| 8 |
dev-libs/gmp: add upstream fix for USE=-asm builds |
| 9 |
|
| 10 |
dev-libs/gmp/files/gmp-6.1.0-udiv.patch | 61 +++++++++++++++++++++++++++++++++ |
| 11 |
dev-libs/gmp/gmp-6.1.0.ebuild | 1 + |
| 12 |
dev-libs/gmp/gmp-6.1.1.ebuild | 1 + |
| 13 |
3 files changed, 63 insertions(+) |
| 14 |
|
| 15 |
diff --git a/dev-libs/gmp/files/gmp-6.1.0-udiv.patch b/dev-libs/gmp/files/gmp-6.1.0-udiv.patch |
| 16 |
new file mode 100644 |
| 17 |
index 00000000..3a6e807 |
| 18 |
--- /dev/null |
| 19 |
+++ b/dev-libs/gmp/files/gmp-6.1.0-udiv.patch |
| 20 |
@@ -0,0 +1,61 @@ |
| 21 |
+https://gmplib.org/list-archives/gmp-bugs/2016-November/004031.html |
| 22 |
+ |
| 23 |
+From dadb1954c8305ea7c7d61d30f7c6338024702280 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Torbjorn Granlund <tg@××××××.org> |
| 25 |
+Date: Sat, 26 Nov 2016 02:58:34 +0100 |
| 26 |
+Subject: [PATCH] Conditionalise udiv_w_sdiv inclusion on --enable-assembly. |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ configure.ac | 16 ++++++++++++---- |
| 30 |
+ 1 file changed, 12 insertions(+), 4 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/configure.ac b/configure.ac |
| 33 |
+index 689e137f24c2..66c8b057574f 100644 |
| 34 |
+--- a/configure |
| 35 |
++++ b/configure |
| 36 |
+@@ -1269,7 +1269,9 @@ case $host in |
| 37 |
+ AC_DEFINE(HAVE_HOST_CPU_FAMILY_power) |
| 38 |
+ HAVE_HOST_CPU_FAMILY_power=1 |
| 39 |
+ cclist="gcc" |
| 40 |
+- extra_functions="udiv_w_sdiv" |
| 41 |
++ if test "$enable_assembly" = "yes" ; then |
| 42 |
++ extra_functions="udiv_w_sdiv" |
| 43 |
++ fi |
| 44 |
+ path="power" |
| 45 |
+ |
| 46 |
+ # gcc 2.7.2 knows rios1, rios2, rsc |
| 47 |
+@@ -1306,7 +1308,9 @@ case $host in |
| 48 |
+ gcc_cflags="$gcc_cflags $fomit_frame_pointer" |
| 49 |
+ gcc_cflags_optlist="arch" |
| 50 |
+ path="s390_32" |
| 51 |
+- extra_functions="udiv_w_sdiv" |
| 52 |
++ if test "$enable_assembly" = "yes" ; then |
| 53 |
++ extra_functions="udiv_w_sdiv" |
| 54 |
++ fi |
| 55 |
+ gcc_32_cflags_maybe="-m31" |
| 56 |
+ |
| 57 |
+ case $host_cpu in |
| 58 |
+@@ -1603,14 +1607,18 @@ case $host in |
| 59 |
+ GMP_INCLUDE_MPN(vax/elf.m4) |
| 60 |
+ gcc_cflags="$gcc_cflags $fomit_frame_pointer" |
| 61 |
+ path="vax" |
| 62 |
+- extra_functions="udiv_w_sdiv" |
| 63 |
++ if test "$enable_assembly" = "yes" ; then |
| 64 |
++ extra_functions="udiv_w_sdiv" |
| 65 |
++ fi |
| 66 |
+ ;; |
| 67 |
+ vax*-*-*) |
| 68 |
+ # Default to aout conventions (i.e., no register prefix, '_' global prefix) |
| 69 |
+ # |
| 70 |
+ gcc_cflags="$gcc_cflags $fomit_frame_pointer" |
| 71 |
+ path="vax" |
| 72 |
+- extra_functions="udiv_w_sdiv" |
| 73 |
++ if test "$enable_assembly" = "yes" ; then |
| 74 |
++ extra_functions="udiv_w_sdiv" |
| 75 |
++ fi |
| 76 |
+ ;; |
| 77 |
+ |
| 78 |
+ |
| 79 |
+-- |
| 80 |
+2.11.0.rc2 |
| 81 |
+ |
| 82 |
|
| 83 |
diff --git a/dev-libs/gmp/gmp-6.1.0.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild |
| 84 |
index c92ceca..a511af5 100644 |
| 85 |
--- a/dev-libs/gmp/gmp-6.1.0.ebuild |
| 86 |
+++ b/dev-libs/gmp/gmp-6.1.0.ebuild |
| 87 |
@@ -34,6 +34,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} |
| 91 |
+ epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch |
| 92 |
|
| 93 |
# note: we cannot run autotools here as gcc depends on this package |
| 94 |
elibtoolize |
| 95 |
|
| 96 |
diff --git a/dev-libs/gmp/gmp-6.1.1.ebuild b/dev-libs/gmp/gmp-6.1.1.ebuild |
| 97 |
index 4de8a1d..adb201e 100644 |
| 98 |
--- a/dev-libs/gmp/gmp-6.1.1.ebuild |
| 99 |
+++ b/dev-libs/gmp/gmp-6.1.1.ebuild |
| 100 |
@@ -33,6 +33,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h ) |
| 101 |
|
| 102 |
src_prepare() { |
| 103 |
[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV} |
| 104 |
+ epatch "${FILESDIR}"/${PN}-6.1.0-udiv.patch |
| 105 |
|
| 106 |
# note: we cannot run autotools here as gcc depends on this package |
| 107 |
elibtoolize |
Archives