[arch-commits] Commit in waf/trunk (PKGBUILD)

[Alexander Epaneshnikov]

    Date: Saturday, May 28, 2022 @ 18:56:56
  Author: alex19ep
Revision: 1212709

upgpkg: waf 2.0.24-2 fix for FS#74863

Modified:
  waf/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-28 18:11:10 UTC (rev 1212708)
+++ PKGBUILD	2022-05-28 18:56:56 UTC (rev 1212709)
@@ -5,7 +5,7 @@
 
 pkgname=waf
 pkgver=2.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc='General-purpose build system modelled after Scons'
 arch=(any)
 url="http://waf.io/"
@@ -24,12 +24,13 @@
         'SKIP'
         'a42039f8419417a312ccdb65a01b22c5e1133ebaa3e3a905387565bf2e3991ce3efb74f3b2fb0ec5e8408b665044946337c6ecfd4af1083ae2811aad9dc7d76e')
 validpgpkeys=('0B3972B2D9E32EAB423D2E0F22BE0C62FFBFA548') # Thomas Nagy <tnagy at waf.io>
-_py_ver=$(python3 -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor))")
 
 prepare() {
+  local py_ver=$(python3 -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor))")
+
   cd $pkgname-$pkgver
   # make waf find its waflib
-  sed -e "/test(i/ s|dirname|'python${_py_ver}/site-packages/waf'|" -i waf-light
+  sed -e "/test(i/ s|dirname|'python${py_ver}/site-packages/waf'|" -i waf-light
   # license needs to be extracted:
   # https://gitlab.com/ita1024/waf/issues/2251
   head -n 30 waf | tail -n 28 | sed -e 's/# //g; s/"""//g' > LICENSE
@@ -46,16 +47,18 @@
 }
 
 package() {
+  local py_ver=$(python3 -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor))")
+
   cd $pkgname-$pkgver
   install -vDm 755 waf -t "$pkgdir/usr/bin"
   install -vDm 644 wscript -t "$pkgdir/usr/share/$pkgname/"
 
   # installing, byte-compiling waflib and stripping pkgdir from it
-  install -vDm 644 waflib/*.py -t "$pkgdir/usr/lib/python$_py_ver/site-packages/waf/waflib/"
-  install -vDm 644 waflib/Tools/*.py -t "$pkgdir/usr/lib/python$_py_ver/site-packages/waf/waflib/Tools/"
-  install -vDm 644 waflib/extras/*.py -t "$pkgdir/usr/lib/python$_py_ver/site-packages/waf/waflib/extras/"
-  python -m compileall -d "/usr/lib/python$_py_ver" "$pkgdir/usr/lib/python$_py_ver/"
-  python -O -m compileall -d "/usr/lib/python$_py_ver" "$pkgdir/usr/lib/python$_py_ver/"
+  install -vDm 644 waflib/*.py -t "$pkgdir/usr/lib/python$py_ver/site-packages/waf/waflib/"
+  install -vDm 644 waflib/Tools/*.py -t "$pkgdir/usr/lib/python$py_ver/site-packages/waf/waflib/Tools/"
+  install -vDm 644 waflib/extras/*.py -t "$pkgdir/usr/lib/python$py_ver/site-packages/waf/waflib/extras/"
+  python -m compileall -d "/usr/lib/python$py_ver" "$pkgdir/usr/lib/python$py_ver/"
+  python -O -m compileall -d "/usr/lib/python$py_ver" "$pkgdir/usr/lib/python$py_ver/"
   install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
   install -vDm 644 {README,../building-waf}.md -t "$pkgdir/usr/share/doc/$pkgname/"
 }