Thu Jan 11 11:31:08 2024 UTC (136d)
mozjs78: Add direct include of iconv.

Previously it was coming in via the clang build dependency, and thus falling
foul of indirect library checks.


(jperkin)
diff -r1.33 -r1.34 pkgsrc/lang/mozjs78/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/lang/mozjs78/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mozjs78/Makefile 2023/11/08 13:19:49 1.33
+++ pkgsrc/lang/mozjs78/Makefile 2024/01/11 11:31:08 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2023/11/08 13:19:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2024/01/11 11:31:08 jperkin Exp $
2 2
3DISTNAME= mozjs78_78.15.0.orig 3DISTNAME= mozjs78_78.15.0.orig
4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} 4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/ 7MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://spidermonkey.dev/ 11HOMEPAGE= https://spidermonkey.dev/
12COMMENT= SpiderMonkey JavaScript library (78.x branch) 12COMMENT= SpiderMonkey JavaScript library (78.x branch)
13LICENSE= mpl-1.1 13LICENSE= mpl-1.1
14 14
@@ -72,26 +72,27 @@ pre-configure: @@ -72,26 +72,27 @@ pre-configure:
72 autoconf-2.13 old-configure.in > old-configure && autoconf-2.13 72 autoconf-2.13 old-configure.in > old-configure && autoconf-2.13
73 ${MKDIR} ${WRKSRC}/js/src/build && \ 73 ${MKDIR} ${WRKSRC}/js/src/build && \
74 ${TOUCH} ${WRKSRC}/js/src/build/old-configure.vars 74 ${TOUCH} ${WRKSRC}/js/src/build/old-configure.vars
75 75
76post-install: 76post-install:
77 cd ${DESTDIR}${PREFIX}/lib && \ 77 cd ${DESTDIR}${PREFIX}/lib && \
78 ${MV} libmozjs-78.so libmozjs-78.so.0.0.0 && \ 78 ${MV} libmozjs-78.so libmozjs-78.so.0.0.0 && \
79 ${LN} -s libmozjs-78.so.0.0.0 libmozjs-78.so.0 && \ 79 ${LN} -s libmozjs-78.so.0.0.0 libmozjs-78.so.0 && \
80 ${LN} -s libmozjs-78.so.0 libmozjs-78.so 80 ${LN} -s libmozjs-78.so.0 libmozjs-78.so
81 ${RM} -f ${DESTDIR}${PREFIX}/lib/libjs_static.ajs 81 ${RM} -f ${DESTDIR}${PREFIX}/lib/libjs_static.ajs
82 ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-78/js-config.h 82 ${CHMOD} -x ${DESTDIR}${PREFIX}/include/mozjs-78/js-config.h
83 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-78.pc 83 ${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-78.pc
84 84
 85.include "../../converters/libiconv/buildlink3.mk"
 86.include "../../devel/zlib/buildlink3.mk"
85BUILDLINK_DEPMETHOD.clang= build 87BUILDLINK_DEPMETHOD.clang= build
86.include "../../lang/clang/buildlink3.mk" 88.include "../../lang/clang/buildlink3.mk"
87RUST_REQ= 1.41.0 89RUST_REQ= 1.41.0
88.include "../../lang/rust/rust.mk" 90.include "../../lang/rust/rust.mk"
89.include "../../devel/zlib/buildlink3.mk" 
90.include "../../lang/python/batteries-included.mk" 91.include "../../lang/python/batteries-included.mk"
91.include "../../lang/python/tool.mk" 92.include "../../lang/python/tool.mk"
92.include "../../textproc/icu/buildlink3.mk" 93.include "../../textproc/icu/buildlink3.mk"
93.include "../../mk/readline.buildlink3.mk" 94.include "../../mk/readline.buildlink3.mk"
94# XXX This does not work entirely correctly at present. There are 95# XXX This does not work entirely correctly at present. There are
95# 26 atomic type test failures on powerpc, where these pass on i386. 96# 26 atomic type test failures on powerpc, where these pass on i386.
96.include "../../mk/atomic64.mk" 97.include "../../mk/atomic64.mk"
97.include "../../mk/bsd.pkg.mk" 98.include "../../mk/bsd.pkg.mk"