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 (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,112 +1,127 @@ @@ -1,112 +1,127 @@
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
15CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/configure 15CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/configure
16CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}configure 16CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}configure
17 17
18OVERRIDE_DIRDEPTH= 3 18OVERRIDE_DIRDEPTH= 3
19 19
20GNU_CONFIGURE= yes 20GNU_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
50SUBST_SED.nspr-rpath= -e 's|$$$$ORIGIN|${PREFIX}/lib/nspr|g' 65SUBST_SED.nspr-rpath= -e 's|$$$$ORIGIN|${PREFIX}/lib/nspr|g'
51 66
52.if ${OPSYS} == "OpenBSD" 67.if ${OPSYS} == "OpenBSD"
53CHECK_SHLIBS_SUPPORTED= no 68CHECK_SHLIBS_SUPPORTED= no
54.endif 69.endif
55 70
56SUBST_CLASSES.Darwin+= exec_path 71SUBST_CLASSES.Darwin+= exec_path
57SUBST_STAGE.exec_path= pre-configure 72SUBST_STAGE.exec_path= pre-configure
58SUBST_MESSAGE.exec_path= Fixing @executable_path 73SUBST_MESSAGE.exec_path= Fixing @executable_path
59SUBST_FILES.exec_path= nspr/configure.in 74SUBST_FILES.exec_path= nspr/configure.in
60SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nspr,g' 75SUBST_SED.exec_path= -e 's,@executable_path,${PREFIX}/lib/nspr,g'
61 76
62.if ${OBJECT_FMT} == "ELF" 77.if ${OBJECT_FMT} == "ELF"
63SO_SUFFIX= so 78SO_SUFFIX= so
64.elif ${OBJECT_FMT} == "Mach-O" 79.elif ${OBJECT_FMT} == "Mach-O"
65SO_SUFFIX= dylib 80SO_SUFFIX= dylib
66.else 81.else
67SO_SUFFIX= so.1.0 82SO_SUFFIX= so.1.0
68.endif 83.endif
69PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} 84PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
70 85
71.if ${OPSYS} == "SunOS" 86.if ${OPSYS} == "SunOS"
72. if defined(ABI) && ${ABI} == "64" 87. if defined(ABI) && ${ABI} == "64"
73CONFIGURE_ARGS+= --enable-64bit 88CONFIGURE_ARGS+= --enable-64bit
74. endif 89. endif
75.endif 90.endif
76 91
77.if ${OPSYS} == "Linux" 92.if ${OPSYS} == "Linux"
78. if defined(ABI) && ${ABI} == "64" 93. if defined(ABI) && ${ABI} == "64"
79CONFIGURE_ARGS+= --enable-64bit 94CONFIGURE_ARGS+= --enable-64bit
80. endif 95. endif
81.endif 96.endif
82 97
83.if ${OPSYS} == "Darwin" 98.if ${OPSYS} == "Darwin"
84. if defined(ABI) && ${ABI} == "64" 99. if defined(ABI) && ${ABI} == "64"
85CONFIGURE_ARGS+= --enable-64bit 100CONFIGURE_ARGS+= --enable-64bit
86. endif 101. endif
87. if exists(/Developer/Headers/FlatCarbon) 102. if exists(/Developer/Headers/FlatCarbon)
88BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon 103BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon
89. endif 104. endif
90.endif 105.endif
91 106
92pre-configure: 107pre-configure:
93 cd ${WRKSRC}/nspr && autoconf 108 cd ${WRKSRC}/nspr && autoconf
94 109
95post-build: 110post-build:
96 set -e; ( \ 111 set -e; ( \
97 ${ECHO} "Name: NSPR"; \ 112 ${ECHO} "Name: NSPR"; \
98 ${ECHO} "Description: The Netscape Portable Runtime"; \ 113 ${ECHO} "Description: The Netscape Portable Runtime"; \
99 ${ECHO} "Version: ${NSPR_RELEASE}"; \ 114 ${ECHO} "Version: ${NSPR_RELEASE}"; \
100 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \ 115 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \
101 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \ 116 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \
102 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \ 117 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \
103 "-lplds4 -lplc4 -lnspr4 "${BUILDLINK_LIBS.pthread:Q}; \ 118 "-lplds4 -lplc4 -lnspr4 "${BUILDLINK_LIBS.pthread:Q}; \
104 ) > ${WRKDIR}/nspr.pc 119 ) > ${WRKDIR}/nspr.pc
105 120
106INSTALLATION_DIRS+= lib/pkgconfig 121INSTALLATION_DIRS+= lib/pkgconfig
107 122
108post-install: 123post-install:
109 ${INSTALL_DATA} ${WRKDIR}/nspr.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 124 ${INSTALL_DATA} ${WRKDIR}/nspr.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
110 125
111.include "../../mk/pthread.buildlink3.mk" 126.include "../../mk/pthread.buildlink3.mk"
112.include "../../mk/bsd.pkg.mk" 127.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/devel/nspr/PLIST (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,88 +1,88 @@ @@ -1,88 +1,88 @@
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
18include/nspr/md/_riscos.cfg 18include/nspr/md/_riscos.cfg
19include/nspr/md/_scoos.cfg 19include/nspr/md/_scoos.cfg
20include/nspr/md/_solaris.cfg 20include/nspr/md/_solaris.cfg
21include/nspr/md/_unixware.cfg 21include/nspr/md/_unixware.cfg
22include/nspr/md/_unixware7.cfg 22include/nspr/md/_unixware7.cfg
23include/nspr/md/_win95.cfg 23include/nspr/md/_win95.cfg
24include/nspr/md/_winnt.cfg 24include/nspr/md/_winnt.cfg
25include/nspr/nspr.h 25include/nspr/nspr.h
26include/nspr/obsolete/pralarm.h 26include/nspr/obsolete/pralarm.h
27include/nspr/obsolete/probslet.h 27include/nspr/obsolete/probslet.h
28include/nspr/obsolete/protypes.h 28include/nspr/obsolete/protypes.h
29include/nspr/obsolete/prsem.h 29include/nspr/obsolete/prsem.h
30include/nspr/plarena.h 30include/nspr/plarena.h
31include/nspr/plarenas.h 31include/nspr/plarenas.h
32include/nspr/plbase64.h 32include/nspr/plbase64.h
33include/nspr/plerror.h 33include/nspr/plerror.h
34include/nspr/plgetopt.h 34include/nspr/plgetopt.h
35include/nspr/plhash.h 35include/nspr/plhash.h
36include/nspr/plstr.h 36include/nspr/plstr.h
37include/nspr/pratom.h 37include/nspr/pratom.h
38include/nspr/prbit.h 38include/nspr/prbit.h
39include/nspr/prclist.h 39include/nspr/prclist.h
40include/nspr/prcmon.h 40include/nspr/prcmon.h
41include/nspr/prcountr.h 41include/nspr/prcountr.h
42include/nspr/prcpucfg.h 42include/nspr/prcpucfg.h
43include/nspr/prcvar.h 43include/nspr/prcvar.h
44include/nspr/prdtoa.h 44include/nspr/prdtoa.h
45include/nspr/prenv.h 45include/nspr/prenv.h
46include/nspr/prerr.h 46include/nspr/prerr.h
47include/nspr/prerror.h 47include/nspr/prerror.h
48include/nspr/prinet.h 48include/nspr/prinet.h
49include/nspr/prinit.h 49include/nspr/prinit.h
50include/nspr/prinrval.h 50include/nspr/prinrval.h
51include/nspr/prio.h 51include/nspr/prio.h
52include/nspr/pripcsem.h 52include/nspr/pripcsem.h
53include/nspr/private/pprio.h 53include/nspr/private/pprio.h
54include/nspr/private/pprthred.h 54include/nspr/private/pprthred.h
55include/nspr/private/prpriv.h 55include/nspr/private/prpriv.h
56include/nspr/prlink.h 56include/nspr/prlink.h
57include/nspr/prlock.h 57include/nspr/prlock.h
58include/nspr/prlog.h 58include/nspr/prlog.h
59include/nspr/prlong.h 59include/nspr/prlong.h
60include/nspr/prmem.h 60include/nspr/prmem.h
61include/nspr/prmon.h 61include/nspr/prmon.h
62include/nspr/prmwait.h 62include/nspr/prmwait.h
63include/nspr/prnetdb.h 63include/nspr/prnetdb.h
64include/nspr/prolock.h 64include/nspr/prolock.h
65include/nspr/prpdce.h 65include/nspr/prpdce.h
66include/nspr/prprf.h 66include/nspr/prprf.h
67include/nspr/prproces.h 67include/nspr/prproces.h
68include/nspr/prrng.h 68include/nspr/prrng.h
69include/nspr/prrwlock.h 69include/nspr/prrwlock.h
70include/nspr/prshm.h 70include/nspr/prshm.h
71include/nspr/prshma.h 71include/nspr/prshma.h
72include/nspr/prsystem.h 72include/nspr/prsystem.h
73include/nspr/prthread.h 73include/nspr/prthread.h
74include/nspr/prtime.h 74include/nspr/prtime.h
75include/nspr/prtpool.h 75include/nspr/prtpool.h
76include/nspr/prtrace.h 76include/nspr/prtrace.h
77include/nspr/prtypes.h 77include/nspr/prtypes.h
78include/nspr/prvrsion.h 78include/nspr/prvrsion.h
79include/nspr/prwin16.h 79include/nspr/prwin16.h
80lib/nspr/libnspr4.a 80lib/nspr/libnspr4.a
81lib/nspr/libnspr4.so 81lib/nspr/libnspr4.so
82lib/nspr/libplc4.a 82lib/nspr/libplc4.a
83lib/nspr/libplc4.so 83lib/nspr/libplc4.so
84lib/nspr/libplds4.a 84lib/nspr/libplds4.a
85lib/nspr/libplds4.so 85lib/nspr/libplds4.so
86lib/nspr/pkgconfig/nspr.pc 86lib/nspr/pkgconfig/nspr.pc
87lib/pkgconfig/nspr.pc 87lib/pkgconfig/nspr.pc
88share/aclocal/nspr.m4 88share/aclocal/nspr.m4