Thu Apr 8 08:43:34 2021 UTC ()
waf: add WAF_HAS_LIBDIR for really old wafs


(wiz)
diff -r1.11 -r1.12 pkgsrc/devel/waf/waf.mk
cvs diff -r1.11 -r1.12 pkgsrc/devel/waf/waf.mk (expand / switch to unified diff)

--- pkgsrc/devel/waf/waf.mk 2020/03/26 15:14:04 1.11
+++ pkgsrc/devel/waf/waf.mk 2021/04/08 08:43:34 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: waf.mk,v 1.11 2020/03/26 15:14:04 nia Exp $ 1# $NetBSD: waf.mk,v 1.12 2021/04/08 08:43:34 wiz 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)
@@ -16,27 +16,30 @@ WAF_ENV+= JOBS=${MAKE_JOBS} @@ -16,27 +16,30 @@ WAF_ENV+= JOBS=${MAKE_JOBS}
16.endif 16.endif
17 17
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_HAS_LIBDIR?= yes
 30.if !empty(WAF_HAS_LIBDIR:M[yY][eE][sS])
29WAF_ARGS+= --libdir=${PREFIX}/lib 31WAF_ARGS+= --libdir=${PREFIX}/lib
 32.endif
30 33
31WAF_REPLACE_EXECUTABLE?= no 34WAF_REPLACE_EXECUTABLE?= no
32.if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS]) 35.if !empty(WAF_REPLACE_EXECUTABLE:M[yY][eE][sS])
33TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf 36TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf
34 37
35post-extract: 38post-extract:
36 cp ${PREFIX}/bin/waf ${WRKSRC} 39 cp ${PREFIX}/bin/waf ${WRKSRC}
37.else 40.else
38. include "../../lang/python/tool.mk" 41. include "../../lang/python/tool.mk"
39.endif 42.endif
40 43
41do-configure: 44do-configure:
42 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure 45 cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure