Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1480779454271630"
MIME-Version: 1.0
Date: Sat, 3 Dec 2016 15:37:34 +0000
From: "John Marino" <marino@netbsd.org>
Subject: CVS commit: pkgsrc/math
To: pkgsrc-changes@NetBSD.org
Reply-To: marino@netbsd.org
Message-Id: <20161203153734.9A6B3FBA6@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1480779454271630
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	marino
Date:		Sat Dec  3 15:37:34 UTC 2016

Modified Files:
	pkgsrc/math/blas: Makefile
	pkgsrc/math/lapack: Makefile.common

Log Message:
math/lapack: Restore build on DragonFly

Linking lapack with the gold linker fails with this error:
fatal error: --sysroot=: must take a non-empty argument

DragonFly has been using the gold linker by default for a while now.
Since I don't have time to track down this linking problem, I'm going
to restore the build on DragonFly by setting an environment variable
that forces DF to use the classic GNU linker instead.

This was already fixed on math/blas which uses the lapack common
makefile, so just relocate the fix to lapack.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/math/blas/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/lapack/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1480779454271630
Content-Disposition: inline
Content-Length: 1628
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/math/blas/Makefile
diff -u pkgsrc/math/blas/Makefile:1.35 pkgsrc/math/blas/Makefile:1.36
--- pkgsrc/math/blas/Makefile:1.35	Sat Dec  3 03:42:44 2016
+++ pkgsrc/math/blas/Makefile	Sat Dec  3 15:37:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/12/03 03:42:44 marino Exp $
+# $NetBSD: Makefile,v 1.36 2016/12/03 15:37:34 marino Exp $
 
 .include "../../math/lapack/Makefile.common"
 
@@ -10,12 +10,6 @@ PATCHDIR=	${.CURDIR}/../../math/lapack/p
 
 BUILD_TARGET=	blaslib
 
-# blas fails using the gold linker with:
-# fatal error: --sysroot=: must take a non-empty argument
-# Work around it on DragonFly by specifying the classic gnu linker
-
-MAKE_ENV+=	LDVER=ld.bfd
-
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.la \
 		${DESTDIR}${PREFIX}/lib

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.3 pkgsrc/math/lapack/Makefile.common:1.4
--- pkgsrc/math/lapack/Makefile.common:1.3	Tue Oct 18 14:08:14 2016
+++ pkgsrc/math/lapack/Makefile.common	Sat Dec  3 15:37:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2016/10/18 14:08:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2016/12/03 15:37:34 marino Exp $
 # used by math/blas/Makefile
 # used by math/lapack/Makefile
 
@@ -18,3 +18,9 @@ DISTINFO_FILE=	${.CURDIR}/../../math/lap
 PATCHDIR=	${.CURDIR}/../../math/lapack/patches
 
 INSTALLATION_DIRS=	lib
+
+# blas fails using the gold linker with:
+# fatal error: --sysroot=: must take a non-empty argument
+# Work around it on DragonFly by specifying the classic gnu linker
+
+MAKE_ENV+=	LDVER=ld.bfd


--_----------=_1480779454271630--