From d7f52db8d5fd2fc1d561ac6097e0401a245dc577 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 1 Sep 2018 01:42:06 +0200 Subject: [PATCH] geany-plugins: don't mess with the masterdir No comment. --- srcpkgs/geany-plugins/template | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index d160c90702b..6f647cc82a3 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -3,7 +3,7 @@ pkgname=geany-plugins version=1.33.0 revision=2 build_style=gnu-configure -configure_args="--enable-all-plugins" +configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins" hostmakedepends="automake gettext-devel intltool libtool pkg-config vala glib-devel python-devel" makedepends="geany-devel lua51-devel ctpl-devel libwnck2-devel GConf-devel @@ -17,22 +17,13 @@ distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz>${pkgna checksum=e889073b573452c91b4d3d87ce45bd4bb57f63e4cde03dea25b6304c5a89bf55 pre_configure() { - # Force python2.7 (configure seems to find the python3 libs for some reason) - rm /usr/bin/python - ln -s python2 /usr/bin/python - NOCONFIGURE=1 ./autogen.sh - if [ "$CROSS_BUILD" ]; then - # Use cross prefix for python + # Use cross prefix for python sed -e "s;-L\$ac_python_libdir;-L${XBPS_CROSS_BASE}/usr/lib;g" \ -e "s;PYTHON_CPPFLAGS=\$python_path;PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7;g" -i configure - else - sed -e "s;-L\$ac_python_libdir;-L/usr/lib;g" \ - -e "s;PYTHON_CPPFLAGS=\$python_path;PYTHON_CPPFLAGS=-I/usr/include/python2.7;g" -i configure fi - } pre_build() {