pkgsrc-WIP-changes archive

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

jhbuild: use REPLACE_INTERPRETER instead of SUBST framework



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Mon Apr 12 14:22:13 2021 +0200
Changeset:	422ae60a322cff9cbc13504838e6ab5752a422b5

Modified Files:
	jhbuild/Makefile

Log Message:
jhbuild: use REPLACE_INTERPRETER instead of SUBST framework

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

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

diffstat:
 jhbuild/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diffs:
diff --git a/jhbuild/Makefile b/jhbuild/Makefile
index c6d95aa0d4..0789a6f8ab 100644
--- a/jhbuild/Makefile
+++ b/jhbuild/Makefile
@@ -22,10 +22,13 @@ BUILD_DEPENDS+=		yelp-tools-[0-9]*:../../textproc/yelp-tools
 
 SUBST_CLASSES+=		python
 SUBST_STAGE.python=	pre-configure
-SUBST_FILES.python=	scripts/jhbuild.in
-SUBST_FILES.python+=	scripts/*.py
-SUBST_SED.python=	-e 's,/usr/bin/env @python@,${PYTHONBIN},g'
-SUBST_SED.python+=	-e 's,/usr/bin/env python3,${PYTHONBIN},g'
+SUBST_FILES.python+=	modulesets/gnome-sysdeps-latest.modules
+SUBST_SED.python+=	-e 's,python3.pc,python-${PYVERSSUFFIX}.pc,g'
+
+REPLACE_INTERPRETER+=	python
+REPLACE.python.old=	/usr/bin/env *.*python*.*
+REPLACE.python.new=	${PYTHONBIN}
+REPLACE_FILES.python=	scripts/*.py scripts/jhbuild.in
 
 PY_PATCHPLIST=		yes
 


Home | Main Index | Thread Index | Old Index