Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A36347A2D6 for ; Mon, 12 Dec 2016 14:23:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 578BE855FF; Mon, 12 Dec 2016 14:23:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DC9F8855C1 for ; Mon, 12 Dec 2016 14:23:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iKE68dh1CYlE for ; Mon, 12 Dec 2016 14:23:47 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 356A984CED for ; Mon, 12 Dec 2016 14:23:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 33398FBA6; Mon, 12 Dec 2016 14:23:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1481552627219620" MIME-Version: 1.0 Date: Mon, 12 Dec 2016 14:23:47 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/math/py-numpy To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161212142347.33398FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1481552627219620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1481552627219620 Content-Disposition: inline Content-Length: 1251 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1481552627219620--