diff options
| author | wiz <wiz> | 2016-12-12 14:36:22 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2016-12-12 14:36:22 +0000 |
| commit | afd11374b8e31fd9c47461e201683341918dbe5e (patch) | |
| tree | 57b58166f6fab252fcd8d30781aa8dc6fb654b91 /math | |
| parent | c82d3a34a5c4dc123226c0d6d4afcca9032eaf52 (diff) | |
| download | pkgsrc-afd11374b8e31fd9c47461e201683341918dbe5e.tar.gz | |
MAKE_ENV is in OPSYSVARS -- simplify previous.
Thanks, jperkin!
Diffstat (limited to 'math')
| -rw-r--r-- | math/lapack/Makefile.common | 8 | ||||
| -rw-r--r-- | math/py-numpy/Makefile | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/math/lapack/Makefile.common b/math/lapack/Makefile.common index d94c5f6fcec..e117b568a35 100644 --- a/math/lapack/Makefile.common +++ b/math/lapack/Makefile.common @@ -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/patches 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 diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 501ae90dbcf..a1640c085d2 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -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 |