From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 503101395E3 for ; Sat, 26 Nov 2016 22:08:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6B0DE0A84; Sat, 26 Nov 2016 22:08:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A7D3E0A61 for ; Sat, 26 Nov 2016 22:08:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42E7C33D3CE for ; Sat, 26 Nov 2016 22:08:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA5C148B for ; Sat, 26 Nov 2016 22:08:04 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1480198073.8dc3f5d8f82efff45280659e5647c82e3ba6c969.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/gmp/, dev-libs/gmp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/gmp/files/gmp-6.1.0-udiv.patch dev-libs/gmp/gmp-6.1.0.ebuild dev-libs/gmp/gmp-6.1.1.ebuild X-VCS-Directories: dev-libs/gmp/files/ dev-libs/gmp/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 8dc3f5d8f82efff45280659e5647c82e3ba6c969 X-VCS-Branch: master Date: Sat, 26 Nov 2016 22:08:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ada5ad38-36e2-4ac8-9c44-eee04fc355ac X-Archives-Hash: 51f7620e0c82d72c17e8a5775e29de0e commit: 8dc3f5d8f82efff45280659e5647c82e3ba6c969 Author: Mike Frysinger gentoo org> AuthorDate: Sat Nov 26 22:03:08 2016 +0000 Commit: Mike Frysinger gentoo 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 +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