Date: Mon, 23 Feb 2015 00:05:40 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379635 - in head/math/openblas: . files Message-ID: <201502230005.t1N05eYn045760@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Mon Feb 23 00:05:39 2015 New Revision: 379635 URL: https://svnweb.freebsd.org/changeset/ports/379635 QAT: https://qat.redports.org/buildarchive/r379635/ Log: Replace using _GCC_VER which is essentially internal to Mk/bsd.gcc.mk (and replaced usage of _GCC_RUNTIME) by LDFLAGS which is a cleaner and more robust approach. PR: 197385 Submitted by: phd_kimberlite@yahoo.co.jp (maintainer) Modified: head/math/openblas/Makefile head/math/openblas/files/patch-Makefile.system Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Sun Feb 22 23:18:26 2015 (r379634) +++ head/math/openblas/Makefile Mon Feb 23 00:05:39 2015 (r379635) @@ -115,11 +115,11 @@ post-patch: ${WRKSRC}/lapack-netlib/lapacke/utils/Makefile \ ${WRKSRC}/reference/Makefile ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ + -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ -e 's+%%LOCALBASE%%+${LOCALBASE}+' \ -e 's+%%FIND%%+${FIND}+' \ -e 's+%%XARGS%%+${XARGS}+' \ -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ - -e 's+%%_GCC_VER%%+${_GCC_VER}+' \ -e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \ ${WRKSRC}/Makefile.system .if ${PORT_OPTIONS:MOPENMP} Modified: head/math/openblas/files/patch-Makefile.system ============================================================================== --- head/math/openblas/files/patch-Makefile.system Sun Feb 22 23:18:26 2015 (r379634) +++ head/math/openblas/files/patch-Makefile.system Mon Feb 23 00:05:39 2015 (r379635) @@ -1,15 +1,14 @@ ---- Makefile.system.orig 2013-07-26 02:34:45.000000000 +0900 -+++ Makefile.system 2013-07-27 01:22:51.000000000 +0900 -@@ -142,6 +142,8 @@ +--- Makefile.system.orig 2014-12-04 00:14:21.000000000 +0900 ++++ Makefile.system 2015-02-23 05:27:11.000000000 +0900 +@@ -199,6 +199,7 @@ endif ifeq ($(OSNAME), FreeBSD) -+EXTRALIB += -lm -+FCOMMON_OPT += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%_GCC_VER%% ++EXTRALIB += -lm %%LDFLAGS%% MD5SUM = md5 -r endif -@@ -856,15 +859,6 @@ +@@ -981,15 +982,6 @@ LIBSUFFIX = a endif @@ -25,7 +24,7 @@ ifndef SMP LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) -@@ -872,7 +866,6 @@ +@@ -997,7 +989,6 @@ LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) endif @@ -33,8 +32,8 @@ LIBDLLNAME = $(LIBPREFIX).dll -@@ -886,7 +879,7 @@ - LIBS_P = $(TOPDIR)/$(LIBNAME_P) +@@ -1028,7 +1019,7 @@ + endif export OSNAME -export ARCH
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502230005.t1N05eYn045760>