From owner-svn-ports-all@FreeBSD.ORG Sat Dec 14 04:47:23 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E8E4AF1; Sat, 14 Dec 2013 04:47:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6ACA715C4; Sat, 14 Dec 2013 04:47:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE4lNSC000464; Sat, 14 Dec 2013 04:47:23 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE4lNVm000463; Sat, 14 Dec 2013 04:47:23 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312140447.rBE4lNVm000463@svn.freebsd.org> From: Kubilay Kocak Date: Sat, 14 Dec 2013 04:47:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336420 - head/math/gmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Dec 2013 04:47:23 -0000 Author: koobs Date: Sat Dec 14 04:47:22 2013 New Revision: 336420 URL: http://svnweb.freebsd.org/changeset/ports/336420 Log: The MCPU_OPTS conditional block currently incorrectly sets ABI=64 for all ARCH strings that in 64. GMP expects mode64, mode32 or 32 as valid values for the ABI option [1]. Using an invalid value causes the following build error on powerpc64: configure: error: ABI=64 is not among the following valid choices: mode64 mode32 32 This is the minimum change to set the correct "mode64" ABI value when ARCH is powerpc64, while also keeping all other semantics the same. A more complete refactor of this port is possible, but would need an exp-run to test for regressions. The change was tested on powerpc64 (thanks justin) and amd64 (for regression) While I'm here: - Remove indefinite article from COMMENT [1] https://gmplib.org/manual/Build-Options.html PR: ports/179127 Submitted by: jhibbits Reviewed by: jhibbits, ak Approved by: maintainer timeout (6 months) Modified: head/math/gmp/Makefile Modified: head/math/gmp/Makefile ============================================================================== --- head/math/gmp/Makefile Sat Dec 14 04:39:27 2013 (r336419) +++ head/math/gmp/Makefile Sat Dec 14 04:47:22 2013 (r336420) @@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gmp MAINTAINER= ale@FreeBSD.org -COMMENT= A free library for arbitrary precision arithmetic +COMMENT= Free library for arbitrary precision arithmetic LICENSE= LGPL3 @@ -34,7 +34,11 @@ INFO= gmp .if ! ${PORT_OPTIONS:MCPU_OPTS} CONFIGURE_ARGS+=--build=${ARCH}-portbld-freebsd${OSREL} .elif ${ARCH:S/64//} != ${ARCH} +.if ${ARCH} == powerpc64 +CONFIGURE_ENV+= ABI="mode64" +.else CONFIGURE_ENV+= ABI="64" +.endif .else CONFIGURE_ENV+= ABI="32" .endif