diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:05:49 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:05:49 +0100 |
| commit | eb9e53e6fec356dba092d3163ede62c834f03fae (patch) | |
| tree | d17ae163dd4262d6a6292cdd65dddc28d7ff7830 /extra | |
| parent | 764007895bd490c1f0d031b9cccea5c2b30c9e1e (diff) | |
| parent | 29a2ef18154808e622c0cd0b4e993e0e62b6b679 (diff) | |
| download | packages-eb9e53e6fec356dba092d3163ede62c834f03fae.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/python/PKGBUILD | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 407d9333..5521b6d6 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -15,16 +15,11 @@ eval "$( " )" -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # remove dependency on most things, we want only a simple interpreter - # a little bit smarter than a shell for building and code generation - makedepends=(${makedepends[@]//tk/}) - makedepends=(${makedepends[@]//bluez-libs/}) - makedepends=(${makedepends[@]//llvm/}) +makedepends=(${makedepends[@]//xorg-server-xvfb/}) +makedepends_i686=(xorg-server-xvfb) - # do not start X servers just for building software! - makedepends=(${makedepends[@]//xorg-server-xvfb/}) +# skip xvfb stuff on i486 +if [ "$CARCH" = 'i486' ]; then eval "$( declare -f build | \ sed ' |