Mon Dec 16 13:31:52 2019 UTC ()
waf: When replacing the executable we generally actually want it installed


(nia)
diff -r1.7 -r1.8 pkgsrc/devel/waf/waf.mk
cvs diff -r1.7 -r1.8 pkgsrc/devel/waf/waf.mk (expand / switch to unified diff)

--- pkgsrc/devel/waf/waf.mk 2019/03/25 14:09:55 1.7
+++ pkgsrc/devel/waf/waf.mk 2019/12/16 13:31:52 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: waf.mk,v 1.7 2019/03/25 14:09:55 tnn Exp $ 1# $NetBSD: waf.mk,v 1.8 2019/12/16 13:31:52 nia Exp $
2 2
3# XXX why does this does not respect the standard pkgsrc variables like 3# XXX why does this does not respect the standard pkgsrc variables like
4# CONFIGURE_ENV et al? 4# CONFIGURE_ENV et al?
5 5
6WAF_ENV+= CC=${CC:Q} 6WAF_ENV+= CC=${CC:Q}
7WAF_ENV+= CFLAGS=${CFLAGS:Q} 7WAF_ENV+= CFLAGS=${CFLAGS:Q}
8WAF_ENV+= CXX=${CXX:Q} 8WAF_ENV+= CXX=${CXX:Q}
9WAF_ENV+= CXXFLAGS=${CXXFLAGS:Q} 9WAF_ENV+= CXXFLAGS=${CXXFLAGS:Q}
10WAF_ENV+= DESTDIR=${DESTDIR} 10WAF_ENV+= DESTDIR=${DESTDIR}
11WAF_ENV+= LINKFLAGS=${LDFLAGS:Q} 11WAF_ENV+= LINKFLAGS=${LDFLAGS:Q}
12WAF_ENV+= PATH=${PATH:Q} 12WAF_ENV+= PATH=${PATH:Q}
13WAF_ENV+= PREFIX=${PREFIX} 13WAF_ENV+= PREFIX=${PREFIX}
14.if defined(MAKE_JOBS) 14.if defined(MAKE_JOBS)
@@ -18,25 +18,27 @@ WAF_ENV+= JOBS=${MAKE_JOBS} @@ -18,25 +18,27 @@ WAF_ENV+= JOBS=${MAKE_JOBS}
18# Kludge to support rst2man on Mac OS X, PR pkg/49921 18# Kludge to support rst2man on Mac OS X, PR pkg/49921
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20.if ${OPSYS} == "Darwin" 20.if ${OPSYS} == "Darwin"
21WAF_ENV+= LC_ALL="en_US.UTF-8" 21WAF_ENV+= LC_ALL="en_US.UTF-8"
22.endif 22.endif
23 23
24WAF_HAS_MANDIR?= yes 24WAF_HAS_MANDIR?= yes
25.if !empty(WAF_HAS_MANDIR:M[yY][eE][sS]) 25.if !empty(WAF_HAS_MANDIR:M[yY][eE][sS])
26WAF_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26WAF_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
27.endif 27.endif
28 28
29WAF_REPLACE_EXECUTABLE?= yes 29WAF_REPLACE_EXECUTABLE?= yes
30.if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS]) 30.if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS])
 31TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf
 32
31post-extract: 33post-extract:
32 cp ${PREFIX}/bin/waf ${WRKSRC} 34 cp ${PREFIX}/bin/waf ${WRKSRC}
33.endif 35.endif
34 36
35do-configure: 37do-configure:
36 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure 38 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure
37 39
38do-build: 40do-build:
39 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} 41 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS}
40 42
41do-install: 43do-install:
42 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} install 44 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} install