From 22ed22fc3284d981abc0c059deba5f45d1d5cb1e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 6 Apr 2018 11:21:18 +0000 Subject: Revert "main/scons: upgrade to python3" packages like serf fails to build with scons with python3. revert for now, again... This reverts commit f9a85640a0321cb63474ce6922325d0ca0847b72. --- main/scons/APKBUILD | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD index 60b9f7fd37..9cd141d0f9 100644 --- a/main/scons/APKBUILD +++ b/main/scons/APKBUILD @@ -2,32 +2,30 @@ # Maintainer: William Pitcock pkgname=scons pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Software construction system" url="http://www.scons.org" arch="noarch" license="MIT" -depends="python3" -makedepends="python3-dev" +# before upgrade to python3, make sure that packages like serf builds with scons with python3 +depends="python2" +makedepends="python2-dev" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - python3 setup.py build + python2 setup.py build } -check() { +package() { cd "$builddir" - python3 setup.py check + python2 setup.py install --prefix=/usr --root="$pkgdir" } -package() { +check() { cd "$builddir" - python3 setup.py install --prefix=/usr --root="$pkgdir" - - # set env to python3 - sed -i 's|/usr/bin/env python|/usr/bin/python3|' "$pkgdir"/usr/bin/* + python2 setup.py check } sha512sums="b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084 scons-3.0.1.tar.gz" -- cgit v1.2.3