pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

emscripten: Wrapper scripts added to $prefix/bin



Module Name:	pkgsrc-wip
Committed By:	Mayuresh <mayuresh%warunjikar.in@localhost>
Pushed By:	mayuresh
Date:		Wed Jan 21 10:01:58 2026 +0530
Changeset:	aaa9d494409ad092752ddfb98a715622a11cc1d6

Modified Files:
	emscripten/Makefile
	emscripten/PLIST
Added Files:
	emscripten/files/em++
	emscripten/files/emcc

Log Message:
emscripten: Wrapper scripts added to $prefix/bin

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aaa9d494409ad092752ddfb98a715622a11cc1d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emscripten/Makefile   | 28 +++++++++++++++-------------
 emscripten/PLIST      |  2 ++
 emscripten/files/em++ |  3 +++
 emscripten/files/emcc |  3 +++
 4 files changed, 23 insertions(+), 13 deletions(-)

diffs:
diff --git a/emscripten/Makefile b/emscripten/Makefile
index c6f9b96ff8..bc516fbf4d 100644
--- a/emscripten/Makefile
+++ b/emscripten/Makefile
@@ -52,27 +52,29 @@ PKGCONFIG_OVERRIDE+=	test/third_party/poppler/poppler-splash.pc.in
 PKGCONFIG_OVERRIDE+=	test/third_party/poppler/poppler.pc.in
 PKGCONFIG_OVERRIDE+=	test/third_party/zlib/zlib.pc.in
 
+SUBST_CLASSES+=		wrappers
+SUBST_STAGE.wrappers=	post-install
+SUBST_FILES.wrappers=	${WRAPPER_SCRIPTS:S,^,${DESTDIR}${PREFIX}/bin/,}
+SUBST_VARS.wrappers+=	PREFIX PKGBASE
+
 do-build:
 
-INSTALLATION_DIRS+=	lib/${PKGBASE}
+INSTALLATION_DIRS+=	lib/${PKGBASE} bin
+WRAPPER_SCRIPTS=	emcc em++
 
 # Borrowed and adopted from FreeBSD port
-do-install: # the native install target installs files into root, see https://github.com/emscripten-core/emscripten/issues/17193
-	cd ${WRKSRC} && ${PAX} -rw em* cmake site src system third_party tools ${DESTDIR}${PREFIX}/lib/${PKGBASE}/
-	${FIND} ${DESTDIR}${PREFIX}/lib/${PKGBASE} \( -name "*.bat" -o -name "*.orig" \) -delete
-.for s in ${PYSCRIPTS}
-	(${ECHO} "#!/bin/sh"; \
-	  ${ECHO} ""; \
-	  ${ECHO} "${PYTHON_CMD} ${PREFIX}/lib/${PKGBASE}/${s}.py \"$$"@"\"" \
-	) > ${DESTDIR}${PREFIX}/lib/${PKGBASE}/${s}
-	${CHMOD} +x ${DESTDIR}${PREFIX}/lib/${PKGBASE}/${s}
-	${RLN} ${DESTDIR}${PREFIX}/lib/${PKGBASE}/${s} ${DESTDIR}${PREFIX}/bin/${s}
-.endfor
+# See https://github.com/emscripten-core/emscripten/issues/17193
+do-install:
+	cd ${WRKSRC} && ${PAX} -rw em* cmake site src system third_party tools \
+		${DESTDIR}${PREFIX}/lib/${PKGBASE}/
+	${FIND} ${DESTDIR}${PREFIX}/lib/${PKGBASE} -name "*.bat" -delete
 	${CHMOD} -R g-w ${DESTDIR}${PREFIX}/lib/emscripten
 	${CHMOD} -x \
 		${DESTDIR}${PREFIX}/lib/emscripten/system/lib/libcxx/readme.txt \
 		${DESTDIR}${PREFIX}/lib/emscripten/third_party/ply/test/testlex.py
-
+.for s in ${WRAPPER_SCRIPTS}
+	${INSTALL_SCRIPT} ${FILESDIR}/${s} ${DESTDIR}${PREFIX}/bin/${s}
+.endfor
 
 .include "../../lang/nodejs/application.mk"
 .include "../../lang/python/application.mk"
diff --git a/emscripten/PLIST b/emscripten/PLIST
index c877ae5327..034b72e74c 100644
--- a/emscripten/PLIST
+++ b/emscripten/PLIST
@@ -1,4 +1,6 @@
 @comment $NetBSD$
+bin/em++
+bin/emcc
 lib/emscripten/cmake/Modules/CheckTypeSize.c.in
 lib/emscripten/cmake/Modules/CheckTypeSize.cmake
 lib/emscripten/cmake/Modules/FindOpenAL.cmake
diff --git a/emscripten/files/em++ b/emscripten/files/em++
new file mode 100755
index 0000000000..5399a05d45
--- /dev/null
+++ b/emscripten/files/em++
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/lib/@PKGBASE@/em++ "$@"
diff --git a/emscripten/files/emcc b/emscripten/files/emcc
new file mode 100755
index 0000000000..a93dd6de9b
--- /dev/null
+++ b/emscripten/files/emcc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/lib/@PKGBASE@/emcc "$@"


Home | Main Index | Thread Index | Old Index