Mercurial > vanilla

changeset 177:5f236cd77524

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/mercurial: use python 2
author David Demelier <markand@malikania.fr>
date Fri, 15 Mar 2019 23:45:08 +0100
parents 7e1ce22dde64
children 8fb6e0b6af51
files dev/mercurial/mercurial.sh python/py-docutils/py-docutils.sh python/python/python.sh
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/dev/mercurial/mercurial.sh	Fri Mar 15 20:45:32 2019 +0100
+++ b/dev/mercurial/mercurial.sh	Fri Mar 15 23:45:08 2019 +0100
@@ -34,8 +34,8 @@
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
-	make PREFIX=/usr all
-	make install PREFIX=/usr DESTDIR=$DESTDIR
+	make PYTHON=python2 PREFIX=/usr all
+	make PYTHON=python2 PREFIX=/usr DESTDIR=$DESTDIR install
 	install -Dm0755 contrib/hg-ssh $DESTDIR/usr/bin/hg-ssh
 	install -Dm0755 contrib/hgk $DESTDIR/usr/libexec/mercurial/hgk
 	install -Dm0644 contrib/zsh_completion $DESTDIR/usr/share/zsh/site-functions/_$PKGNAME
--- a/python/py-docutils/py-docutils.sh	Fri Mar 15 20:45:32 2019 +0100
+++ b/python/py-docutils/py-docutils.sh	Fri Mar 15 23:45:08 2019 +0100
@@ -22,7 +22,7 @@
 PKGLICENSE="BSD2CLAUSE GPLv3"
 PKGSUMMARY="Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX"
 PKGDOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-$PKGVERSION.tar.gz"
-PKGDEPENDS="python/python"
+PKGDEPENDS="python/python python/python2"
 
 build()
 {
@@ -30,6 +30,7 @@
 	tar xvaf docutils-$PKGVERSION.tar.gz
 	pushd docutils-$PKGVERSION
 
+	python2 setup.py install --root=${DESTDIR:-/} -O1
 	python setup.py install --root=${DESTDIR:-/} -O1
 
 	popd
--- a/python/python/python.sh	Fri Mar 15 20:45:32 2019 +0100
+++ b/python/python/python.sh	Fri Mar 15 23:45:08 2019 +0100
@@ -56,6 +56,7 @@
 		--enable-shared \
 		--with-system-expat \
 		--with-system-ffi \
+		--without-ensurepip \
 		$with_ipv6
 	make
 	make install DESTDIR=$DESTDIR