pkgsrc-Changes archive

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

CVS commit: pkgsrc/math/py-numpy



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

Modified Files:
        pkgsrc/math/py-numpy: Makefile

Log Message:
Wrap DragonFly specific workaround in .if ${OPSYS} == "DragonFly"


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 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/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.34 pkgsrc/math/py-numpy/Makefile:1.35
--- pkgsrc/math/py-numpy/Makefile:1.34  Sun Dec  4 22:51:55 2016
+++ pkgsrc/math/py-numpy/Makefile       Mon Dec 12 14:23:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/12/04 22:51:55 marino Exp $
+# $NetBSD: Makefile,v 1.35 2016/12/12 14:23:47 wiz Exp $
 
 DISTNAME=      numpy-1.11.2
 GITHUB_PROJECT=        numpy
@@ -17,12 +17,6 @@ MAKE_ENV+=           ATLAS=None
 
 REPLACE_PYTHON+=       *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
 
-# 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
-
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
 
@@ -40,6 +34,13 @@ 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
+
 # TEST_DEPENDS
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 



Home | Main Index | Thread Index | Old Index