diff options
| author | redfish | 2018-08-22 20:25:42 -0400 |
|---|---|---|
| committer | redfish | 2018-08-22 20:29:02 -0400 |
| commit | da62de7e0819a75024c297b112babe7882c155e8 (patch) | |
| tree | 1ba3a0e79d3b81327cd6bd8dfcf1e23ede5d449b | |
| parent | eb33dbd483c4828f64e67cbb6c52fdb2b4103f26 (diff) | |
| download | aur-da62de7e0819a75024c297b112babe7882c155e8.tar.gz | |
switch to python2 because zbar only works with v2
zbar is optional (for gnunet-qr), but I'm reluctant to only change
python version for that script and not for other scripts. But,
could do that, in order to not retard everything to v2 because
of one optional dependency.
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 11 insertions, 7 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Wed Aug 22 23:41:11 UTC 2018 +# Thu Aug 23 00:24:56 UTC 2018 pkgbase = gnunet-git pkgdesc = A framework for secure peer-to-peer networking pkgver = 0.11.0.r25825.081f818a0 @@ -13,7 +13,7 @@ pkgbase = gnunet-git makedepends = autoconf makedepends = fakeuser-git makedepends = bluez-libs - makedepends = python + makedepends = python2 makedepends = glpk makedepends = libpulse makedepends = opus @@ -23,7 +23,7 @@ pkgbase = gnunet-git depends = libmicrohttpd depends = jansson optdepends = bluez-libs - optdepends = python + optdepends = python2 optdepends = glpk optdepends = libpulse optdepends = opus @@ -17,9 +17,9 @@ conflicts=("${_appname}") depends=('libextractor' 'sqlite' 'gnurl' 'libmicrohttpd' 'jansson') makedepends=('gettext' 'pkgconfig' 'autoconf' 'fakeuser-git' - 'bluez-libs' 'python' 'glpk' 'libpulse' 'opus') + 'bluez-libs' 'python2' 'glpk' 'libpulse' 'opus') optdepends=('bluez-libs' - 'python' + 'python2' 'glpk' 'libpulse' 'opus' @@ -66,8 +66,12 @@ prepare() { cd "${srcdir}/${_appname}" - # zbar only has bindings for python2 - sed -i '1s/python/python2/' gnunet/src/util/gnunet-qr + + # zbar (required by gnunet-qr) only has bindings for python2, so we have to use python2 + # Not sure whether other parts of Gnunet fully support Python v3.0. It does build with v3. + # NOTE: can't override in aclocal.m4 (that file is autogenerated) + _redefine_py="m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python2])" + sed -i "0,/^AM_PATH_PYTHON.*/s/^AM_PATH_PYTHON.*/$_redefine_py\n&/" configure.ac autoreconf -fi sed -i 's|contrib doc|doc|' Makefile.* |