Sat Dec 3 15:37:34 2016 UTC ()
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.


(marino)
diff -r1.35 -r1.36 pkgsrc/math/blas/Makefile
diff -r1.3 -r1.4 pkgsrc/math/lapack/Makefile.common
cvs diff -r1.35 -r1.36 pkgsrc/math/blas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/blas/Makefile 2016/12/03 03:42:44 1.35
+++ pkgsrc/math/blas/Makefile 2016/12/03 15:37:34 1.36
@@ -1,23 +1,17 @@ @@ -1,23 +1,17 @@
1# $NetBSD: Makefile,v 1.35 2016/12/03 03:42:44 marino Exp $ 1# $NetBSD: Makefile,v 1.36 2016/12/03 15:37:34 marino Exp $
2 2
3.include "../../math/lapack/Makefile.common" 3.include "../../math/lapack/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/lapack/blas/} 5PKGNAME= ${DISTNAME:S/lapack/blas/}
6 6
7COMMENT= Basic Linear Algebra Subprograms (Fortran) 7COMMENT= Basic Linear Algebra Subprograms (Fortran)
8 8
9PATCHDIR= ${.CURDIR}/../../math/lapack/patches 9PATCHDIR= ${.CURDIR}/../../math/lapack/patches
10 10
11BUILD_TARGET= blaslib 11BUILD_TARGET= blaslib
12 12
13# blas fails using the gold linker with: 
14# fatal error: --sysroot=: must take a non-empty argument 
15# Work around it on DragonFly by specifying the classic gnu linker 
16 
17MAKE_ENV+= LDVER=ld.bfd 
18 
19do-install: 13do-install:
20 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.la \ 14 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/BLAS/SRC/libblas.la \
21 ${DESTDIR}${PREFIX}/lib 15 ${DESTDIR}${PREFIX}/lib
22 16
23.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/math/lapack/Makefile.common (expand / switch to unified diff)

--- pkgsrc/math/lapack/Makefile.common 2016/10/18 14:08:14 1.3
+++ pkgsrc/math/lapack/Makefile.common 2016/12/03 15:37:34 1.4
@@ -1,20 +1,26 @@ @@ -1,20 +1,26 @@
1# $NetBSD: Makefile.common,v 1.3 2016/10/18 14:08:14 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.4 2016/12/03 15:37:34 marino Exp $
2# used by math/blas/Makefile 2# used by math/blas/Makefile
3# used by math/lapack/Makefile 3# used by math/lapack/Makefile
4 4
5DISTNAME= lapack-3.6.1 5DISTNAME= lapack-3.6.1
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/} 7MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@NetBSD.org
11HOMEPAGE= http://www.netlib.org/lapack/ 11HOMEPAGE= http://www.netlib.org/lapack/
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c fortran 14USE_LANGUAGES= c fortran
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16 16
17DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo
18PATCHDIR= ${.CURDIR}/../../math/lapack/patches 18PATCHDIR= ${.CURDIR}/../../math/lapack/patches
19 19
20INSTALLATION_DIRS= lib 20INSTALLATION_DIRS= lib
 21
 22# blas fails using the gold linker with:
 23# fatal error: --sysroot=: must take a non-empty argument
 24# Work around it on DragonFly by specifying the classic gnu linker
 25
 26MAKE_ENV+= LDVER=ld.bfd