pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint pkgtools/pkglint: fix build when PKGS...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/382be3cbae4a
branches:  trunk
changeset: 387058:382be3cbae4a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 08 19:41:32 2018 +0000

description:
pkgtools/pkglint: fix build when PKGSRC_RUN_TEST is not set

diffstat:

 pkgtools/pkglint/Makefile |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r d8add147a372 -r 382be3cbae4a pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Nov 08 19:41:30 2018 +0000
+++ b/pkgtools/pkglint/Makefile Thu Nov 08 19:41:32 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.554 2018/11/07 20:58:22 rillig Exp $
+# $NetBSD: Makefile,v 1.555 2018/11/08 19:41:32 rillig Exp $
 
 PKGNAME=       pkglint-5.6.6
 DISTFILES=     # none
@@ -27,9 +27,17 @@
 TOOLS_PATH.goyacc=     ${WRKDIR}/bin/goyacc
 USE_TOOLS+=            goyacc
 
+# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
+.include "../../lang/go/go-package.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
 do-extract:
        ${RUN} ${MKDIR} ${WRKDIR}/pkglint
        ${RUN} cd ${FILESDIR} && ${PAX} -rw . ${WRKDIR}/pkglint
+.if !${PKGSRC_RUN_TEST:M[yY][eE][sS]}
+       ${RUN} rm -rf ${WRKDIR}/pkglint/intqa
+.endif
        ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get golang.org/x/tools/cmd/goyacc
        ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install golang.org/x/tools/cmd/goyacc
 
@@ -42,11 +50,6 @@
 
 post-install: do-install-man
 
-# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
-.include "../../lang/go/go-package.mk"
-
-.include "../../mk/bsd.prefs.mk"
-
 do-install-man: .PHONY
 .if ${MANINSTALL:Mcatinstall}
 .  if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}



Home | Main Index | Thread Index | Old Index