Mon Dec 12 14:36:23 2016 UTC ()
MAKE_ENV is in OPSYSVARS -- simplify previous.

Thanks, jperkin!


(wiz)
diff -r1.5 -r1.6 pkgsrc/math/lapack/Makefile.common
diff -r1.35 -r1.36 pkgsrc/math/py-numpy/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/math/lapack/Makefile.common (expand / switch to unified diff)

--- pkgsrc/math/lapack/Makefile.common 2016/12/12 14:24:59 1.5
+++ pkgsrc/math/lapack/Makefile.common 2016/12/12 14:36:23 1.6
@@ -1,30 +1,26 @@ @@ -1,30 +1,26 @@
1# $NetBSD: Makefile.common,v 1.5 2016/12/12 14:24:59 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.6 2016/12/12 14:36:23 wiz 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 21
22.include "../../mk/bsd.prefs.mk" 
23 
24.if ${OPSYS} == "DragonFly" 
25# blas fails using the gold linker with: 22# blas fails using the gold linker with:
26# fatal error: --sysroot=: must take a non-empty argument 23# fatal error: --sysroot=: must take a non-empty argument
27# Work around it on DragonFly by specifying the classic gnu linker 24# Work around it on DragonFly by specifying the classic gnu linker
28 25
29MAKE_ENV+= LDVER=ld.bfd 26MAKE_ENV.DragonFly+= LDVER=ld.bfd
30.endif 
cvs diff -r1.35 -r1.36 pkgsrc/math/py-numpy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/Makefile 2016/12/12 14:23:47 1.35
+++ pkgsrc/math/py-numpy/Makefile 2016/12/12 14:36:22 1.36
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.35 2016/12/12 14:23:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2016/12/12 14:36:22 wiz Exp $
2 2
3DISTNAME= numpy-1.11.2 3DISTNAME= numpy-1.11.2
4GITHUB_PROJECT= numpy 4GITHUB_PROJECT= numpy
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= math python 6CATEGORIES= math python
7MASTER_SITES= ${MASTER_SITE_GITHUB:=numpy/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=numpy/}
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.numpy.org/ 11HOMEPAGE= http://www.numpy.org/
12COMMENT= Array processing for numbers, strings, records, and objects 12COMMENT= Array processing for numbers, strings, records, and objects
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -24,32 +24,30 @@ REPLACE_PYTHON+= *.py */*.py */*/*.py */ @@ -24,32 +24,30 @@ REPLACE_PYTHON+= *.py */*.py */*/*.py */
24PYSETUPBUILDARGS+= --fcompiler=g95 24PYSETUPBUILDARGS+= --fcompiler=g95
25.elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran) 25.elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran)
26PYSETUPBUILDARGS+= --fcompiler=gnu95 26PYSETUPBUILDARGS+= --fcompiler=gnu95
27.elif !empty(PKGSRC_COMPILER:Mgcc) 27.elif !empty(PKGSRC_COMPILER:Mgcc)
28PYSETUPBUILDARGS+= --fcompiler=gnu 28PYSETUPBUILDARGS+= --fcompiler=gnu
29.endif 29.endif
30 30
31# This package bypasses the wrappers and calls the compilers directly when 31# This package bypasses the wrappers and calls the compilers directly when
32# linking, so ensure that we pass through requisite options. 32# linking, so ensure that we pass through requisite options.
33LDFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} 33LDFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}}
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37.if ${OPSYS} == "DragonFly" 
38# numpy fails using the gold linker with: 37# numpy fails using the gold linker with:
39# fatal error: --sysroot=: must take a non-empty argument 38# fatal error: --sysroot=: must take a non-empty argument
40# Work around it on DragonFly by specifying the classic gnu linker 39# Work around it on DragonFly by specifying the classic gnu linker
41MAKE_ENV+= LDVER=ld.bfd 40MAKE_ENV.DragonFly+= LDVER=ld.bfd
42.endif 
43 41
44# TEST_DEPENDS 42# TEST_DEPENDS
45BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 43BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
46 44
47do-test: 45do-test:
48 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()" 46 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
49 47
50.include "../../devel/py-cython/buildlink3.mk" 48.include "../../devel/py-cython/buildlink3.mk"
51.include "../../lang/python/application.mk" 49.include "../../lang/python/application.mk"
52.include "../../lang/python/egg.mk" 50.include "../../lang/python/egg.mk"
53.if ${OPSYS} != "Darwin" 51.if ${OPSYS} != "Darwin"
54# blas and lapack are not needed; numpy will use Accelerate.framework 52# blas and lapack are not needed; numpy will use Accelerate.framework
55.include "../../math/blas/buildlink3.mk" 53.include "../../math/blas/buildlink3.mk"