From bcb5133554da96e552b4d74fe48d336a80efebed Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 9 Nov 2018 13:53:18 +0100 Subject: "if [ $CARCH = ... ]; then depends=..; fi" => "depends_...=..." --- extra/cmake/PKGBUILD | 5 ++++- extra/doxygen/PKGBUILD | 24 ++++++++++++++---------- extra/git/PKGBUILD | 5 ++++- extra/hwloc/PKGBUILD | 8 +++----- extra/java7-openjdk/PKGBUILD | 7 ++++--- extra/jsoncpp/PKGBUILD | 7 +++++-- extra/libjpeg-turbo/PKGBUILD | 5 ++++- extra/libunwind/PKGBUILD | 8 +++----- extra/libxkbcommon/PKGBUILD | 7 +++++-- extra/nasm/PKGBUILD | 6 ++++-- extra/python/PKGBUILD | 2 +- extra/python2/PKGBUILD | 2 +- extra/qt5-base/PKGBUILD | 2 +- extra/subversion/PKGBUILD | 35 +++++++++++++++++++---------------- extra/wayland/PKGBUILD | 11 +++++++---- 15 files changed, 79 insertions(+), 55 deletions(-) (limited to 'extra') diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 2128d8f8..2ca8c08f 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,7 +1,10 @@ +# no Qt5 GUI on i486 +makedepends=(${makedepends[@]//qt5-base/}) +makedepends_i686+=(qt5-base) + # 486-specific if [ "${CARCH}" = "i486" ]; then # no Qt5 GUI - makedepends=(${makedepends[@]//qt5-base/}) eval "$( declare -f build | \ sed ' diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 24e360d8..72ebfd3a 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -9,20 +9,24 @@ eval "$( ' )" -if [ "${CARCH}" = "i486" ]; then - # no qt5 - makedepends=(${makedepends[@]//qt5-base/}) +# no qt5 on i486 +makedepends=(${makedepends[@]//qt5-base/}) +makedepends_i686+=(qt5-base) - # no TeX - makedepends=(${makedepends[@]//texlive-core/}) - makedepends=(${makedepends[@]//texlive-latexextra/}) +# no TeX on i486 +makedepends=(${makedepends[@]//texlive-core/}) +makedepends=(${makedepends[@]//texlive-latexextra/}) +makedepends_i686+=(texlive-core texlive-latexextra) - # no Graphviz - makedepends=(${makedepends[@]//graphviz/}) +# no Graphviz on i486 +makedepends=(${makedepends[@]//graphviz/}) +makedepends_i686+=(graphviz) - # no ghostscript - makedepends=(${makedepends[@]//ghostscript/}) +# no ghostscript on i486 +makedepends=(${makedepends[@]//ghostscript/}) +makedepends_i686+=(ghostscript) +if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ sed ' diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 36b2d040..b66cc8dc 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,7 +1,10 @@ +# no Gnome on i486 +makedepends=(${makedepends[@]//libgnome-keyring/}) +makedepends_i686+=(libgnome-keyring) + # 486-specific if [ "${CARCH}" = "i486" ]; then # no Gnome - makedepends=(${makedepends[@]//libgnome-keyring/}) eval "$( declare -f build | \ sed ' diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index f271a407..f2d05b95 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,5 +1,3 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # no cairo - makedepends=(${makedepends[@]//cairo/}) -fi +# no cairo on i486 +makedepends=(${makedepends[@]//cairo/}) +makedepends_i686+=(cairo) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index b36e427d..2112d4ad 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,7 +1,8 @@ +# gtk2 is an optdepend +makedepends=(${makedepends[@]//gtk2/}) +makedepends_i686+=(gtk2) + # i486-specific if [ "${CARCH}" = "i486" ]; then _JARCH=i386 - - # gtk2 is an optdepend - makedepends=(${makedepends[@]//gtk2/}) fi diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD index 519381b5..64e3d308 100644 --- a/extra/jsoncpp/PKGBUILD +++ b/extra/jsoncpp/PKGBUILD @@ -1,7 +1,10 @@ +# no graphviz on i486 +makedepends=(${makedepends[@]//graphviz/}) +makedepends_i686+=(graphviz) + # 486-specific if [ "${CARCH}" = "i486" ]; then - # do graphviz - makedepends=(${makedepends[@]//graphviz/}) + # no graphviz eval "$( declare -f build | \ sed ' diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index e33bc686..15f620d3 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,6 +1,9 @@ +# no Java on i486 +makedepends=(${makedepends[@]//jdk8-openjdk/}) +makedepends_i686+=(jdk8-openjdk) + if [ "${CARCH}" = "i486" ]; then # no Java - makedepends=(${makedepends[@]//jdk8-openjdk/}) eval "$( declare -f build | \ sed ' diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD index 8bf87ab2..a8d82b23 100644 --- a/extra/libunwind/PKGBUILD +++ b/extra/libunwind/PKGBUILD @@ -1,5 +1,3 @@ -# i486-specific -if [ "${CARCH}" = "i486" ]; then - # no TeX for documentation - makedepends=(${makedepends[@]//texlive-core/}) -fi +# no TeX for documentation on i486 +makedepends=(${makedepends[@]//texlive-core/}) +makedepends_i686+=(texlive-core) diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index 802fc9c2..d5c1d607 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -1,8 +1,11 @@ +# no documentation on i486 +makedepends=(${makedepends[@]//graphviz/}) +makedepends=(${makedepends[@]//doxygen/}) +makedepends_i686+=(graphviz doxygen) + # i486-specific if [ "${CARCH}" = "i486" ]; then # no documentation - makedepends=(${makedepends[@]//graphviz/}) - makedepends=(${makedepends[@]//doxygen/}) eval "$( declare -f build | \ diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 36e81008..6e1fab99 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -6,11 +6,13 @@ prepare() { patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch" } +# remove ttf-liberation on i486 (X packages missing for installing the font) +makedepends=(${makedepends[@]//ttf-liberation/}) +makedepends_i686+=(ttf-liberation) + # i486-specific if [ "${CARCH}" = "i486" ]; then # remove ttf-liberation (X packages missing for installing the font) - makedepends=(${makedepends[@]//ttf-liberation/}) - eval "$( declare -f build | \ sed " diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 5521b6d6..43352eb3 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -16,7 +16,7 @@ eval "$( )" makedepends=(${makedepends[@]//xorg-server-xvfb/}) -makedepends_i686=(xorg-server-xvfb) +makedepends_i686+=(xorg-server-xvfb) # skip xvfb stuff on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index c012a42d..2da91370 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -20,7 +20,7 @@ eval "$( )" makedepends=(${makedepends[@]//xorg-server-xvfb/}) -makedepends_i686=(xorg-server-xvfb) +makedepends_i686+=(xorg-server-xvfb) # skip xvfb stuff on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD index 5459bf68..4c9c9195 100644 --- a/extra/qt5-base/PKGBUILD +++ b/extra/qt5-base/PKGBUILD @@ -6,7 +6,7 @@ eval "$( )" makedepends=(${makedepends[@]/vulkan-headers/}) -makedepends_i686=(vulkan-headers) +makedepends_i686+=(vulkan-headers) if [ "$CARCH" = 'i486' ]; then eval "$( declare -f build | \ diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 941792d7..da86150e 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,17 +1,25 @@ +# no Java bindings on i486 +makedepends=(${makedepends[@]//java-environment<10/}) +makedepends_i686+=(java-environment<10) + +# no Ruby bindings on i486 +makedepends=(${makedepends[@]//ruby/}) +checkdepends=(${checkdepends[@]//ruby-test-unit/}) +makedepends_i686+=(ruby) +checkdepends_i686+=(ruby-test-unit) + +# no KDE gui on i486 +makedepends=(${makedepends[@]//kdelibs4support/}) +makedepends=(${makedepends[@]//kwallet/}) +makedepends_i686+=(kdelibs4support kwallet) + +# no Gnome gui on i486 +makedepends=(${makedepends[@]//libgnome-keyring/}) +makedepends_i686+=(libgnome-keyring) + # i486-specific if [ "${CARCH}" = "i486" ]; then - # no Apache server integration - makedepends=(${makedepends[@]//apache/}) - eval "$( - declare -f build | \ - sed ' - s@--with-apxs@@ - s@--with-apache-libexecdir=/usr/lib/httpd/modules@@ - ' - )" - # no Java bindings - makedepends=(${makedepends[@]//java-environment<10/}) eval "$( declare -f build | \ sed ' @@ -28,8 +36,6 @@ if [ "${CARCH}" = "i486" ]; then )" # no Ruby bindings - makedepends=(${makedepends[@]//ruby/}) - checkdepends=(${checkdepends[@]//ruby-test-unit/}) eval "$( declare -f build | \ sed ' @@ -51,8 +57,6 @@ if [ "${CARCH}" = "i486" ]; then )" # no KDE gui - makedepends=(${makedepends[@]//kdelibs4support/}) - makedepends=(${makedepends[@]//kwallet/}) eval "$( declare -f build | \ sed ' @@ -61,7 +65,6 @@ if [ "${CARCH}" = "i486" ]; then )" # no Gnome gui - makedepends=(${makedepends[@]//libgnome-keyring/}) eval "$( declare -f build | \ sed ' diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index e4e996bc..e2df8a75 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,13 @@ +# no documentation on i486 +makedepends=(${makedepends[@]//graphviz/}) +makedepends=(${makedepends[@]//doxygen/}) +makedepends=(${makedepends[@]//xmlto/}) +makedepends=(${makedepends[@]//docbook-xsl/}) +makedepends_i686+=(graphviz doxygen xmlto docbook-xsl) + # i486-specific if [ "${CARCH}" = "i486" ]; then # no documentation - makedepends=(${makedepends[@]//graphviz/}) - makedepends=(${makedepends[@]//doxygen/}) - makedepends=(${makedepends[@]//xmlto/}) - makedepends=(${makedepends[@]//docbook-xsl/}) eval "$( declare -f build | \ -- cgit v1.2.3