summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/automake/PKGBUILD7
-rw-r--r--core/dbus/PKGBUILD8
-rw-r--r--core/glibc/PKGBUILD2
-rw-r--r--core/groff/PKGBUILD2
-rw-r--r--core/libidn2/PKGBUILD8
-rw-r--r--core/libsecret/PKGBUILD7
-rw-r--r--core/links/PKGBUILD8
-rw-r--r--core/linux/PKGBUILD2
-rw-r--r--core/pinentry/PKGBUILD14
-rw-r--r--core/shadow/PKGBUILD7
-rw-r--r--extra/cmake/PKGBUILD5
-rw-r--r--extra/doxygen/PKGBUILD24
-rw-r--r--extra/git/PKGBUILD5
-rw-r--r--extra/hwloc/PKGBUILD8
-rw-r--r--extra/java7-openjdk/PKGBUILD7
-rw-r--r--extra/jsoncpp/PKGBUILD7
-rw-r--r--extra/libjpeg-turbo/PKGBUILD5
-rw-r--r--extra/libunwind/PKGBUILD8
-rw-r--r--extra/libxkbcommon/PKGBUILD7
-rw-r--r--extra/nasm/PKGBUILD6
-rw-r--r--extra/python/PKGBUILD2
-rw-r--r--extra/python2/PKGBUILD2
-rw-r--r--extra/qt5-base/PKGBUILD2
-rw-r--r--extra/subversion/PKGBUILD35
-rw-r--r--extra/wayland/PKGBUILD11
-rw-r--r--multilib/fasm/PKGBUILD2
26 files changed, 113 insertions, 88 deletions
diff --git a/core/automake/PKGBUILD b/core/automake/PKGBUILD
index af9256a9..e1221ed5 100644
--- a/core/automake/PKGBUILD
+++ b/core/automake/PKGBUILD
@@ -1,5 +1,4 @@
# 486-specific: we have no Vala or Java at the moment
-if [ "${CARCH}" = "i486" ]; then
- checkdepends=(${checkdepends[@]//vala/})
- checkdepends=(${checkdepends[@]//java-environment/})
-fi
+checkdepends=(${checkdepends[@]//vala/})
+checkdepends=(${checkdepends[@]//java-environment/})
+checkdepends_i686+=(vala java-environment)
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 41a96d38..835abb54 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no graphviz generated graphs in documentation
- makedepends=(${makedepends[@]//graphviz/})
-fi
+# no graphviz generated graphs in documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7e0ce35f..02dbf6e4 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -27,7 +27,7 @@ eval "$(
# no gd for memory profiles
makedepends=(${makedepends[@]//gd/})
-makedepends_i686=('gd')
+makedepends_i686+=('gd')
if [ "${CARCH}" = "i486" ]; then
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 6bda4b0c..f06aaa84 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,2 +1,2 @@
makedepends=(${makedepends[@]//psutils/})
-makedepends_i686=(psutils)
+makedepends_i686+=(psutils)
diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD
index 4bd3a316..23ba1170 100644
--- a/core/libidn2/PKGBUILD
+++ b/core/libidn2/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # remove dependency on ruby-ronn
- makedepends=(${makedepends[@]//ruby-ronn/})
-fi
+# remove dependency on ruby-ronn on i486
+makedepends=(${makedepends[@]//ruby-ronn/})
+makedepends_i686+=(ruby-ronn)
diff --git a/core/libsecret/PKGBUILD b/core/libsecret/PKGBUILD
index d2a68fe8..9aab2048 100644
--- a/core/libsecret/PKGBUILD
+++ b/core/libsecret/PKGBUILD
@@ -1,8 +1,9 @@
+# no Vala on i486
+makedepends=(${makedepends[@]//vala/})
+makedepends_i686+=(vala)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
- # no Vala
- makedepends=(${makedepends[@]//vala/})
-
# no Gnome (gjs), no dbus-glib
unset check
fi
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index bbe7457e..b30ed33e 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no librsvg, has a cycle with half of gtk
- makedepends=(${makedepends[@]//librsvg/})
-fi
+# no librsvg on i486, requires rust - yuck
+makedepends=(${makedepends[@]//librsvg/})
+makedepends_i686+=(librsvg)
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 5f021765..8ca51dd2 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -11,7 +11,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
done
makedepends=(${makedepends[@]/graphviz/})
-makedepends_i686=(graphviz)
+makedepends_i686+=(graphviz)
eval "$(
declare -f prepare | \
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 9c1f0644..a36a140d 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,15 @@
+# no GUI stuff on i486
+makedepends=(${makedepends[@]//gtk2/})
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(gtk2 qt5-base)
+
+# no gcr on i486
+makedepends=(${makedepends[@]//gcr/})
+makedepends_i686+=(gcr)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# no GUI stuff
- makedepends=(${makedepends[@]//gtk2/})
- makedepends=(${makedepends[@]//qt5-base/})
eval "$(
declare -f build | \
sed '
@@ -11,7 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
s/--enable-pinentry-qt/--disable-pinentry-qt/
'
)"
-
- # no gcr
- makedepends=(${makedepends[@]//gcr/})
fi
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index ef3f908c..b625f595 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,9 +1,12 @@
+# remove dependency on Gnome's xml2po on i486 (needed for building the
+# man pages, draws in far too many dependencies)
+makedepends=(${makedepends[@]//gnome-doc-utils/})
+makedepends_i686+=(gnome-doc-utils)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# remove dependency on Gnome's xml2po (needed for building the man pages,
# draws in far too many dependencies)
- makedepends=(${makedepends[@]//gnome-doc-utils/})
-
eval "$(
declare -f prepare | \
sed '
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 | \
diff --git a/multilib/fasm/PKGBUILD b/multilib/fasm/PKGBUILD
index 895ff6c5..8dd79a3f 100644
--- a/multilib/fasm/PKGBUILD
+++ b/multilib/fasm/PKGBUILD
@@ -1,4 +1,4 @@
-depends_i686=('glibc')
+depends_i686+=('glibc')
eval "$(
declare -f build | \
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 15:19:43 +0000