Tue Jun 27 10:44:01 2023 UTC ()
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.


(riastradh)
diff -r1.122 -r1.123 pkgsrc/devel/nspr/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/nspr/PLIST
cvs diff -r1.122 -r1.123 pkgsrc/devel/nspr/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nspr/Makefile 2022/12/15 23:01:17 1.122
+++ pkgsrc/devel/nspr/Makefile 2023/06/27 10:44:01 1.123
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.122 2022/12/15 23:01:17 adam Exp $ 1# $NetBSD: Makefile,v 1.123 2023/06/27 10:44:01 riastradh Exp $
2 2
3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} 3DISTNAME= nspr-${NSPR_RELEASE:S/.0$//}
4NSPR_RELEASE= 4.35.0 4NSPR_RELEASE= 4.35.0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/} 6MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR 9HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
10COMMENT= Platform-neutral API for system level and libc like functions 10COMMENT= Platform-neutral API for system level and libc like functions
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 13CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
14CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 14CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
@@ -21,29 +21,44 @@ GNU_CONFIGURE= yes @@ -21,29 +21,44 @@ GNU_CONFIGURE= yes
21GNU_CONFIGURE_LIBSUBDIR= nspr 21GNU_CONFIGURE_LIBSUBDIR= nspr
22CONFIGURE_DIRS= nspr 22CONFIGURE_DIRS= nspr
23 23
24USE_GCC_RUNTIME= yes 24USE_GCC_RUNTIME= yes
25USE_TOOLS+= autoconf gmake perl 25USE_TOOLS+= autoconf gmake perl
26REPLACE_PERL+= nspr/pr/src/misc/compile-et.pl 26REPLACE_PERL+= nspr/pr/src/misc/compile-et.pl
27 27
28CONFIGURE_ARGS+= --disable-debug 28CONFIGURE_ARGS+= --disable-debug
29CONFIGURE_ARGS+= --with-pthreads 29CONFIGURE_ARGS+= --with-pthreads
30CONFIGURE_ENV+= LIBRUNPATH=${PREFIX}/lib/nspr 30CONFIGURE_ENV+= LIBRUNPATH=${PREFIX}/lib/nspr
31 31
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33 33
 34PLIST_VARS+= native
 35
34.if ${USE_CROSS_COMPILE:U:tl} == yes 36.if ${USE_CROSS_COMPILE:U:tl} == yes
35MAKE_FLAGS+= HOST_CC=${NATIVE_CC:Q} 37MAKE_FLAGS+= HOST_CC=${NATIVE_CC:Q}
36MAKE_FLAGS+= HOST_CXX=${NATIVE_CXX:Q} 38MAKE_FLAGS+= HOST_CXX=${NATIVE_CXX:Q}
 39post-install: post-install-rm-perl
 40.PHONY: post-install-rm-perl
 41post-install-rm-perl:
 42 ${RUN} rm ${DESTDIR:Q}${PREFIX:Q}/bin/compile-et.pl
 43 ${RUN} rm ${DESTDIR:Q}${PREFIX:Q}/bin/prerr.properties
 44.else
 45# XXX Not actually sure if compile-et.pl or prerr.properties are
 46# supposed to be included -- they are run at build-time, and other
 47# packaging systems like Debian exclude them. But out of an abundance
 48# of caution, let's avoid breaking downstream packages for now
 49# (20230609) by continuing to include these in native builds. (Cross
 50# builds break because of the missing interpreter.)
 51PLIST.native= yes
37.endif 52.endif
38 53
39BUILDLINK_TRANSFORM+= rm:-Wall 54BUILDLINK_TRANSFORM+= rm:-Wall
40 55
41SUBST_CLASSES+= nspr-config 56SUBST_CLASSES+= nspr-config
42SUBST_STAGE.nspr-config= pre-configure 57SUBST_STAGE.nspr-config= pre-configure
43SUBST_MESSAGE.nspr-config= Fixing nspr-config run path 58SUBST_MESSAGE.nspr-config= Fixing nspr-config run path
44SUBST_FILES.nspr-config= nspr/config/nspr-config.in 59SUBST_FILES.nspr-config= nspr/config/nspr-config.in
45SUBST_SED.nspr-config= -e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g' 60SUBST_SED.nspr-config= -e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g'
46 61
47SUBST_CLASSES+= nspr-rpath 62SUBST_CLASSES+= nspr-rpath
48SUBST_STAGE.nspr-rpath= pre-configure 63SUBST_STAGE.nspr-rpath= pre-configure
49SUBST_FILES.nspr-rpath= nspr/lib/libc/src/Makefile.in nspr/lib/ds/Makefile.in 64SUBST_FILES.nspr-rpath= nspr/lib/libc/src/Makefile.in nspr/lib/ds/Makefile.in
cvs diff -r1.17 -r1.18 pkgsrc/devel/nspr/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/nspr/PLIST 2021/07/01 07:23:00 1.17
+++ pkgsrc/devel/nspr/PLIST 2023/06/27 10:44:01 1.18
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1@comment $NetBSD: PLIST,v 1.17 2021/07/01 07:23:00 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.18 2023/06/27 10:44:01 riastradh Exp $
2bin/compile-et.pl 2${PLIST.native}bin/compile-et.pl
3bin/nspr-config 3bin/nspr-config
4bin/prerr.properties 4${PLIST.native}bin/prerr.properties
5include/nspr/md/_aix32.cfg 5include/nspr/md/_aix32.cfg
6include/nspr/md/_aix64.cfg 6include/nspr/md/_aix64.cfg
7include/nspr/md/_bsdi.cfg 7include/nspr/md/_bsdi.cfg
8include/nspr/md/_darwin.cfg 8include/nspr/md/_darwin.cfg
9include/nspr/md/_freebsd.cfg 9include/nspr/md/_freebsd.cfg
10include/nspr/md/_hpux32.cfg 10include/nspr/md/_hpux32.cfg
11include/nspr/md/_hpux64.cfg 11include/nspr/md/_hpux64.cfg
12include/nspr/md/_linux.cfg 12include/nspr/md/_linux.cfg
13include/nspr/md/_netbsd.cfg 13include/nspr/md/_netbsd.cfg
14include/nspr/md/_nto.cfg 14include/nspr/md/_nto.cfg
15include/nspr/md/_openbsd.cfg 15include/nspr/md/_openbsd.cfg
16include/nspr/md/_os2.cfg 16include/nspr/md/_os2.cfg
17include/nspr/md/_qnx.cfg 17include/nspr/md/_qnx.cfg