Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0A33084CD8 for ; Tue, 27 Jun 2023 10:44:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 78dep64KLrH7 for ; Tue, 27 Jun 2023 10:44:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 608C584CCC for ; Tue, 27 Jun 2023 10:44:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5E506FA89; Tue, 27 Jun 2023 10:44:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687862641217870" MIME-Version: 1.0 Date: Tue, 27 Jun 2023 10:44:01 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/devel/nspr To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230627104401.5E506FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687862641217870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Tue Jun 27 10:44:01 UTC 2023 Modified Files: pkgsrc/devel/nspr: Makefile PLIST Log Message: devel/nspr: Don't install compile-et.pl in cross-builds. Nor prerr.properties. Not sure if these are ever useful for native builds, but compile-et.pl is a build-time executable with the wrong interpreter for cross builds. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 pkgsrc/devel/nspr/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/nspr/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687862641217870 Content-Disposition: inline Content-Length: 1917 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/nspr/Makefile diff -u pkgsrc/devel/nspr/Makefile:1.122 pkgsrc/devel/nspr/Makefile:1.123 --- pkgsrc/devel/nspr/Makefile:1.122 Thu Dec 15 23:01:17 2022 +++ pkgsrc/devel/nspr/Makefile Tue Jun 27 10:44:01 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2022/12/15 23:01:17 adam Exp $ +# $NetBSD: Makefile,v 1.123 2023/06/27 10:44:01 riastradh Exp $ DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} NSPR_RELEASE= 4.35.0 @@ -31,9 +31,24 @@ CONFIGURE_ENV+= LIBRUNPATH=${PREFIX}/li .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= native + .if ${USE_CROSS_COMPILE:U:tl} == yes MAKE_FLAGS+= HOST_CC=${NATIVE_CC:Q} MAKE_FLAGS+= HOST_CXX=${NATIVE_CXX:Q} +post-install: post-install-rm-perl +.PHONY: post-install-rm-perl +post-install-rm-perl: + ${RUN} rm ${DESTDIR:Q}${PREFIX:Q}/bin/compile-et.pl + ${RUN} rm ${DESTDIR:Q}${PREFIX:Q}/bin/prerr.properties +.else +# XXX Not actually sure if compile-et.pl or prerr.properties are +# supposed to be included -- they are run at build-time, and other +# packaging systems like Debian exclude them. But out of an abundance +# of caution, let's avoid breaking downstream packages for now +# (20230609) by continuing to include these in native builds. (Cross +# builds break because of the missing interpreter.) +PLIST.native= yes .endif BUILDLINK_TRANSFORM+= rm:-Wall Index: pkgsrc/devel/nspr/PLIST diff -u pkgsrc/devel/nspr/PLIST:1.17 pkgsrc/devel/nspr/PLIST:1.18 --- pkgsrc/devel/nspr/PLIST:1.17 Thu Jul 1 07:23:00 2021 +++ pkgsrc/devel/nspr/PLIST Tue Jun 27 10:44:01 2023 @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.17 2021/07/01 07:23:00 wiz Exp $ -bin/compile-et.pl +@comment $NetBSD: PLIST,v 1.18 2023/06/27 10:44:01 riastradh Exp $ +${PLIST.native}bin/compile-et.pl bin/nspr-config -bin/prerr.properties +${PLIST.native}bin/prerr.properties include/nspr/md/_aix32.cfg include/nspr/md/_aix64.cfg include/nspr/md/_bsdi.cfg --_----------=_1687862641217870--