From owner-svn-ports-head@FreeBSD.ORG Tue Sep 16 19:04:10 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF20493B; Tue, 16 Sep 2014 19:04:10 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B066DD30; Tue, 16 Sep 2014 19:04:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8GJ4AwH030766; Tue, 16 Sep 2014 19:04:10 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8GJ4AZu030763; Tue, 16 Sep 2014 19:04:10 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201409161904.s8GJ4AZu030763@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Tue, 16 Sep 2014 19:04:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368343 - in head/math/gsl: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Sep 2014 19:04:11 -0000 Author: sbruno Date: Tue Sep 16 19:04:09 2014 New Revision: 368343 URL: http://svnweb.freebsd.org/changeset/ports/368343 QAT: https://qat.redports.org/buildarchive/r368343/ Log: Fix all non-x86 builds of math/gsl with a more general approach than the specifically powerpc patch file. Drop patch-ieee-utils-fp-freebsd.c alltogether and change the order of #ifdefs in the setup to pull in fp-gnuc99.c instead of fp-freebsd.cc Verified on redports for x86 builds and am bumping port revision. Suggested by: nathanw Phabric: https://reviews.freebsd.org/D787 Reviewed by: nathanw Approved by: bdrewery (mentor) Added: head/math/gsl/files/patch-ieee-utils__fp.c (contents, props changed) Deleted: head/math/gsl/files/patch-ieee-utils-fp-freebsd.c Modified: head/math/gsl/Makefile Modified: head/math/gsl/Makefile ============================================================================== --- head/math/gsl/Makefile Tue Sep 16 18:25:05 2014 (r368342) +++ head/math/gsl/Makefile Tue Sep 16 19:04:09 2014 (r368343) @@ -3,7 +3,7 @@ PORTNAME= gsl PORTVERSION= 1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= GNU Added: head/math/gsl/files/patch-ieee-utils__fp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/gsl/files/patch-ieee-utils__fp.c Tue Sep 16 19:04:09 2014 (r368343) @@ -0,0 +1,20 @@ +--- ieee-utils/fp.c.orig 2014-09-16 17:19:39 UTC ++++ ieee-utils/fp.c +@@ -22,6 +22,8 @@ + #include "fp-aix.c" + #elif HAVE_TRU64_IEEE_INTERFACE + #include "fp-tru64.c" ++#elif HAVE_DECL_FEENABLEEXCEPT || HAVE_DECL_FESETTRAPENABLE ++#include "fp-gnuc99.c" + #elif HAVE_FREEBSD_IEEE_INTERFACE + #include "fp-freebsd.c" + #elif HAVE_OS2EMX_IEEE_INTERFACE +@@ -43,8 +45,6 @@ + # else + # include "fp-darwin86.c" + #endif +-#elif HAVE_DECL_FEENABLEEXCEPT || HAVE_DECL_FESETTRAPENABLE +-#include "fp-gnuc99.c" + #else + #include "fp-unknown.c" + #endif