diff options
| author | tron <tron> | 2011-04-12 22:36:11 +0000 |
|---|---|---|
| committer | tron <tron> | 2011-04-12 22:36:11 +0000 |
| commit | 1311046e35cc048dbf9de4389c08bd6d3ee4a5cb (patch) | |
| tree | 7ffe22a5b5237431401d5599a09e9df1ad651827 /pkgtools/rpm2pkg | |
| parent | dc1db6df1ff1cc0548eb023eba52a75495a44441 (diff) | |
| download | pkgsrc-1311046e35cc048dbf9de4389c08bd6d3ee4a5cb.tar.gz | |
Make build warnings non-fatal unless developer mode is enabled.
Diffstat (limited to 'pkgtools/rpm2pkg')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 17 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/Makefile | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 6a69f47c147..88901479833 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2011/04/12 22:12:41 tron Exp $ +# $NetBSD: Makefile,v 1.59 2011/04/12 22:36:11 tron Exp $ DISTNAME= rpm2pkg-3.2.2 CATEGORIES= pkgtools @@ -23,17 +23,22 @@ MAKE_ENV+= FILESDIR=${FILESDIR:Q} MAKE_FILE= ${FILESDIR}/Makefile WRKSRC= ${WRKDIR} -.include "../../mk/compiler.mk" - INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../archivers/xz/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/bsd.prefs.mk" + +.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" +MAKE_ENV+= WARNS=4 +.else +MAKE_ENV+= NOGCCERROR=yes +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${DESTDIR}${PREFIX}/sbin ${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/rpm2pkg/files/Makefile b/pkgtools/rpm2pkg/files/Makefile index 616e96f3451..46fc9435b5a 100644 --- a/pkgtools/rpm2pkg/files/Makefile +++ b/pkgtools/rpm2pkg/files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/01/19 16:23:02 tron Exp $ +# $NetBSD: Makefile,v 1.4 2011/04/12 22:36:11 tron Exp $ PROG= rpm2pkg SRCS= fileio.c package-list.c parse-rpm.c rpm2pkg.c @@ -7,7 +7,7 @@ MAN= BINDIR= ${PREFIX}/sbin LDADD= -lbz2 -llzma -lz -WARNS= 4 +#WARNS= 4 #CFLAGS+= -g #LDFLAGS+= -g |