pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math MAKE_ENV is in OPSYSVARS -- simplify previous.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8036050a3b5
branches:  trunk
changeset: 355806:c8036050a3b5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 12 14:36:22 2016 +0000

description:
MAKE_ENV is in OPSYSVARS -- simplify previous.

Thanks, jperkin!

diffstat:

 math/lapack/Makefile.common |  8 ++------
 math/py-numpy/Makefile      |  6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 3eaffef25da0 -r c8036050a3b5 math/lapack/Makefile.common
--- a/math/lapack/Makefile.common       Mon Dec 12 14:33:24 2016 +0000
+++ b/math/lapack/Makefile.common       Mon Dec 12 14:36:22 2016 +0000
@@ -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 @@
 
 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 -r 3eaffef25da0 -r c8036050a3b5 math/py-numpy/Makefile
--- a/math/py-numpy/Makefile    Mon Dec 12 14:33:24 2016 +0000
+++ b/math/py-numpy/Makefile    Mon Dec 12 14:36:22 2016 +0000
@@ -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 @@
 
 .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



Home | Main Index | Thread Index | Old Index