CVS commit: pkgsrc/math

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 12 14:36:23 UTC 2016

Modified Files:
        pkgsrc/math/lapack: Makefile.common
        pkgsrc/math/py-numpy: Makefile

Log Message:
MAKE_ENV is in OPSYSVARS -- simplify previous.

Thanks, jperkin!


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/math/py-numpy/Makefile

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

Modified files:

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.5 pkgsrc/math/lapack/Makefile.common:1.6
--- pkgsrc/math/lapack/Makefile.common:1.5      Mon Dec 12 14:24:59 2016
+++ pkgsrc/math/lapack/Makefile.common  Mon Dec 12 14:36:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2016/12/12 14:24:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2016/12/12 14:36:23 wiz Exp $
 # used by math/blas/Makefile
 # used by math/lapack/Makefile
 
@@ -19,12 +19,8 @@ PATCHDIR=    ${.CURDIR}/../../math/lapack/p
 
 INSTALLATION_DIRS=     lib
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "DragonFly"
 # 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
-.endif
+MAKE_ENV.DragonFly+=   LDVER=ld.bfd

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.35 pkgsrc/math/py-numpy/Makefile:1.36
--- pkgsrc/math/py-numpy/Makefile:1.35  Mon Dec 12 14:23:47 2016
+++ pkgsrc/math/py-numpy/Makefile       Mon Dec 12 14:36:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/12/12 14:23:47 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2016/12/12 14:36:22 wiz Exp $
 
 DISTNAME=      numpy-1.11.2
 GITHUB_PROJECT=        numpy
@@ -34,12 +34,10 @@ LDFLAGS+=           ${_COMPILER_ABI_FLAG.${ABI}}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "DragonFly"
 # numpy 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
-.endif
+MAKE_ENV.DragonFly+=   LDVER=ld.bfd
 
 # TEST_DEPENDS
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose