pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/waf waf: Not replacing the executable by default...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7c7796097bc
branches:  trunk
changeset: 420945:a7c7796097bc
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jan 09 23:09:58 2020 +0000

description:
waf: Not replacing the executable by default is probably a good idea.

"Waf script '2.0.19' and library '2.0.18' do not match (directory '/home/nia/pkgsrc/audio/suil/work/suil-0.10.6')"

diffstat:

 devel/waf/waf.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 86a4a1da1c10 -r a7c7796097bc devel/waf/waf.mk
--- a/devel/waf/waf.mk  Thu Jan 09 20:52:08 2020 +0000
+++ b/devel/waf/waf.mk  Thu Jan 09 23:09:58 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: waf.mk,v 1.9 2020/01/08 13:15:09 wiz Exp $
+# $NetBSD: waf.mk,v 1.10 2020/01/09 23:09:58 nia Exp $
 
 # XXX why does this does not respect the standard pkgsrc variables like
 # CONFIGURE_ENV et al?
@@ -26,12 +26,14 @@
 WAF_ARGS+=             --mandir=${PREFIX}/${PKGMANDIR}
 .endif
 
-WAF_REPLACE_EXECUTABLE?=       yes
+WAF_REPLACE_EXECUTABLE?=       no
 .if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS])
 TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf
 
 post-extract:
        cp ${PREFIX}/bin/waf ${WRKSRC}
+.else
+.  include "../../lang/python/tool.mk"
 .endif
 
 do-configure:



Home | Main Index | Thread Index | Old Index