Browse Source

"if [ $CARCH = ... ]; then depends=..; fi" => "depends_...=..."

Erich Eckner 11 months ago
parent
commit
bcb5133554

+ 3
- 4
core/automake/PKGBUILD View File

@@ -1,5 +1,4 @@
1 1
 # 486-specific: we have no Vala or Java at the moment
2
-if [ "${CARCH}" = "i486" ]; then
3
-  checkdepends=(${checkdepends[@]//vala/})
4
-  checkdepends=(${checkdepends[@]//java-environment/})
5
-fi
2
+checkdepends=(${checkdepends[@]//vala/})
3
+checkdepends=(${checkdepends[@]//java-environment/})
4
+checkdepends_i686+=(vala java-environment)

+ 3
- 5
core/dbus/PKGBUILD View File

@@ -1,5 +1,3 @@
1
-# i486-specific
2
-if [ "${CARCH}" = "i486" ]; then
3
-  # no graphviz generated graphs in documentation
4
-  makedepends=(${makedepends[@]//graphviz/})
5
-fi
1
+# no graphviz generated graphs in documentation on i486
2
+makedepends=(${makedepends[@]//graphviz/})
3
+makedepends_i686+=(graphviz)

+ 1
- 1
core/glibc/PKGBUILD View File

@@ -27,7 +27,7 @@ eval "$(
27 27
 
28 28
 # no gd for memory profiles
29 29
 makedepends=(${makedepends[@]//gd/})
30
-makedepends_i686=('gd')
30
+makedepends_i686+=('gd')
31 31
 
32 32
 if [ "${CARCH}" = "i486" ]; then
33 33
 

+ 1
- 1
core/groff/PKGBUILD View File

@@ -1,2 +1,2 @@
1 1
 makedepends=(${makedepends[@]//psutils/})
2
-makedepends_i686=(psutils)
2
+makedepends_i686+=(psutils)

+ 3
- 5
core/libidn2/PKGBUILD View File

@@ -1,5 +1,3 @@
1
-# i486-specific
2
-if [ "${CARCH}" = "i486" ]; then
3
-  # remove dependency on ruby-ronn 
4
-  makedepends=(${makedepends[@]//ruby-ronn/})
5
-fi
1
+# remove dependency on ruby-ronn on i486
2
+makedepends=(${makedepends[@]//ruby-ronn/})
3
+makedepends_i686+=(ruby-ronn)

+ 4
- 3
core/libsecret/PKGBUILD View File

@@ -1,8 +1,9 @@
1
+# no Vala on i486
2
+makedepends=(${makedepends[@]//vala/})
3
+makedepends_i686+=(vala)
4
+
1 5
 # i486-specific
2 6
 if [ "${CARCH}" = "i486" ]; then
3
-  # no Vala
4
-  makedepends=(${makedepends[@]//vala/})
5
-
6 7
   # no Gnome (gjs), no dbus-glib
7 8
   unset check
8 9
 fi

+ 3
- 5
core/links/PKGBUILD View File

@@ -1,5 +1,3 @@
1
-# i486-specific
2
-if [ "${CARCH}" = "i486" ]; then
3
-  # no librsvg, has a cycle with half of gtk
4
-  makedepends=(${makedepends[@]//librsvg/})  
5
-fi
1
+# no librsvg on i486, requires rust - yuck
2
+makedepends=(${makedepends[@]//librsvg/})
3
+makedepends_i686+=(librsvg)

+ 1
- 1
core/linux/PKGBUILD View File

@@ -11,7 +11,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
11 11
 done
12 12
 
13 13
 makedepends=(${makedepends[@]/graphviz/})
14
-makedepends_i686=(graphviz)
14
+makedepends_i686+=(graphviz)
15 15
 
16 16
 eval "$(
17 17
   declare -f prepare | \

+ 9
- 5
core/pinentry/PKGBUILD View File

@@ -1,8 +1,15 @@
1
+# no GUI stuff on i486
2
+makedepends=(${makedepends[@]//gtk2/})
3
+makedepends=(${makedepends[@]//qt5-base/})
4
+makedepends_i686+=(gtk2 qt5-base)
5
+
6
+# no gcr on i486
7
+makedepends=(${makedepends[@]//gcr/})
8
+makedepends_i686+=(gcr)
9
+
1 10
 # i486-specific
2 11
 if [ "${CARCH}" = "i486" ]; then
3 12
   # no GUI stuff
4
-  makedepends=(${makedepends[@]//gtk2/})
5
-  makedepends=(${makedepends[@]//qt5-base/})
6 13
   eval "$(
7 14
     declare -f build | \
8 15
       sed '
@@ -11,7 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
11 18
         s/--enable-pinentry-qt/--disable-pinentry-qt/
12 19
       '
13 20
   )"
14
-
15
-  # no gcr
16
-  makedepends=(${makedepends[@]//gcr/})
17 21
 fi

+ 5
- 2
core/shadow/PKGBUILD View File

@@ -1,9 +1,12 @@
1
+# remove dependency on Gnome's xml2po on i486 (needed for building the
2
+# man pages, draws in far too many dependencies)
3
+makedepends=(${makedepends[@]//gnome-doc-utils/})
4
+makedepends_i686+=(gnome-doc-utils)
5
+
1 6
 # i486-specific
2 7
 if [ "${CARCH}" = "i486" ]; then
3 8
   # remove dependency on Gnome's xml2po (needed for building the man pages,
4 9
   # draws in far too many dependencies)
5
-  makedepends=(${makedepends[@]//gnome-doc-utils/})
6
-  
7 10
   eval "$(
8 11
     declare -f prepare | \
9 12
       sed '

+ 4
- 1
extra/cmake/PKGBUILD View File

@@ -1,7 +1,10 @@
1
+# no Qt5 GUI on i486
2
+makedepends=(${makedepends[@]//qt5-base/})
3
+makedepends_i686+=(qt5-base)
4
+
1 5
 # 486-specific
2 6
 if [ "${CARCH}" = "i486" ]; then
3 7
   # no Qt5 GUI
4
-  makedepends=(${makedepends[@]//qt5-base/})
5 8
   eval "$(
6 9
     declare -f build | \
7 10
       sed '

+ 14
- 10
extra/doxygen/PKGBUILD View File

@@ -9,20 +9,24 @@ eval "$(
9 9
     '
10 10
 )"
11 11
 
12
-if [ "${CARCH}" = "i486" ]; then
13
-  # no qt5
14
-  makedepends=(${makedepends[@]//qt5-base/})
12
+# no qt5 on i486
13
+makedepends=(${makedepends[@]//qt5-base/})
14
+makedepends_i686+=(qt5-base)
15 15
 
16
-  # no TeX
17
-  makedepends=(${makedepends[@]//texlive-core/})
18
-  makedepends=(${makedepends[@]//texlive-latexextra/})
16
+# no TeX on i486
17
+makedepends=(${makedepends[@]//texlive-core/})
18
+makedepends=(${makedepends[@]//texlive-latexextra/})
19
+makedepends_i686+=(texlive-core texlive-latexextra)
19 20
 
20
-  # no Graphviz
21
-  makedepends=(${makedepends[@]//graphviz/})
21
+# no Graphviz on i486
22
+makedepends=(${makedepends[@]//graphviz/})
23
+makedepends_i686+=(graphviz)
22 24
 
23
-  # no ghostscript
24
-  makedepends=(${makedepends[@]//ghostscript/})
25
+# no ghostscript on i486
26
+makedepends=(${makedepends[@]//ghostscript/})
27
+makedepends_i686+=(ghostscript)
25 28
 
29
+if [ "${CARCH}" = "i486" ]; then
26 30
   eval "$(
27 31
     declare -f build | \
28 32
       sed '

+ 4
- 1
extra/git/PKGBUILD View File

@@ -1,7 +1,10 @@
1
+# no Gnome on i486
2
+makedepends=(${makedepends[@]//libgnome-keyring/})
3
+makedepends_i686+=(libgnome-keyring)
4
+
1 5
 # 486-specific
2 6
 if [ "${CARCH}" = "i486" ]; then
3 7
   # no Gnome
4
-  makedepends=(${makedepends[@]//libgnome-keyring/})
5 8
   eval "$(
6 9
     declare -f build | \
7 10
       sed '

+ 3
- 5
extra/hwloc/PKGBUILD View File

@@ -1,5 +1,3 @@
1
-# i486-specific
2
-if [ "${CARCH}" = "i486" ]; then
3
-  # no cairo
4
-  makedepends=(${makedepends[@]//cairo/})
5
-fi
1
+# no cairo on i486
2
+makedepends=(${makedepends[@]//cairo/})
3
+makedepends_i686+=(cairo)

+ 4
- 3
extra/java7-openjdk/PKGBUILD View File

@@ -1,7 +1,8 @@
1
+# gtk2 is an optdepend
2
+makedepends=(${makedepends[@]//gtk2/})
3
+makedepends_i686+=(gtk2)
4
+
1 5
 # i486-specific
2 6
 if [ "${CARCH}" = "i486" ]; then
3 7
   _JARCH=i386
4
-
5
-  # gtk2 is an optdepend
6
-  makedepends=(${makedepends[@]//gtk2/})
7 8
 fi

+ 5
- 2
extra/jsoncpp/PKGBUILD View File

@@ -1,7 +1,10 @@
1
+# no graphviz on i486
2
+makedepends=(${makedepends[@]//graphviz/})
3
+makedepends_i686+=(graphviz)
4
+
1 5
 # 486-specific
2 6
 if [ "${CARCH}" = "i486" ]; then
3
-  # do graphviz
4
-  makedepends=(${makedepends[@]//graphviz/})
7
+  # no graphviz
5 8
   eval "$(
6 9
     declare -f build | \
7 10
       sed '

+ 4
- 1
extra/libjpeg-turbo/PKGBUILD View File

@@ -1,6 +1,9 @@
1
+# no Java on i486
2
+makedepends=(${makedepends[@]//jdk8-openjdk/})
3
+makedepends_i686+=(jdk8-openjdk)
4
+
1 5
 if [ "${CARCH}" = "i486" ]; then
2 6
   # no Java
3
-  makedepends=(${makedepends[@]//jdk8-openjdk/})
4 7
   eval "$(
5 8
     declare -f build | \
6 9
       sed '

+ 3
- 5
extra/libunwind/PKGBUILD View File

@@ -1,5 +1,3 @@
1
-# i486-specific
2
-if [ "${CARCH}" = "i486" ]; then
3
-  # no TeX for documentation
4
-  makedepends=(${makedepends[@]//texlive-core/})
5
-fi
1
+# no TeX for documentation on i486
2
+makedepends=(${makedepends[@]//texlive-core/})
3
+makedepends_i686+=(texlive-core)

+ 5
- 2
extra/libxkbcommon/PKGBUILD View File

@@ -1,8 +1,11 @@
1
+# no documentation on i486
2
+makedepends=(${makedepends[@]//graphviz/})
3
+makedepends=(${makedepends[@]//doxygen/})
4
+makedepends_i686+=(graphviz doxygen)
5
+
1 6
 # i486-specific
2 7
 if [ "${CARCH}" = "i486" ]; then
3 8
   # no documentation
4
-  makedepends=(${makedepends[@]//graphviz/})
5
-  makedepends=(${makedepends[@]//doxygen/})
6 9
 
7 10
   eval "$(
8 11
     declare -f build | \

+ 4
- 2
extra/nasm/PKGBUILD View File

@@ -6,11 +6,13 @@ prepare() {
6 6
   patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
7 7
 }
8 8
 
9
+# remove ttf-liberation on i486 (X packages missing for installing the font)
10
+makedepends=(${makedepends[@]//ttf-liberation/})
11
+makedepends_i686+=(ttf-liberation)
12
+
9 13
 # i486-specific
10 14
 if [ "${CARCH}" = "i486" ]; then
11 15
   # remove ttf-liberation (X packages missing for installing the font)
12
-  makedepends=(${makedepends[@]//ttf-liberation/})
13
-
14 16
   eval "$(
15 17
     declare -f build | \
16 18
       sed "

+ 1
- 1
extra/python/PKGBUILD View File

@@ -16,7 +16,7 @@ eval "$(
16 16
 )"
17 17
 
18 18
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
19
-makedepends_i686=(xorg-server-xvfb)
19
+makedepends_i686+=(xorg-server-xvfb)
20 20
 
21 21
 # skip xvfb stuff on i486
22 22
 if [ "$CARCH" = 'i486' ]; then

+ 1
- 1
extra/python2/PKGBUILD View File

@@ -20,7 +20,7 @@ eval "$(
20 20
 )"
21 21
 
22 22
 makedepends=(${makedepends[@]//xorg-server-xvfb/})
23
-makedepends_i686=(xorg-server-xvfb)
23
+makedepends_i686+=(xorg-server-xvfb)
24 24
 
25 25
 # skip xvfb stuff on i486
26 26
 if [ "$CARCH" = 'i486' ]; then

+ 1
- 1
extra/qt5-base/PKGBUILD View File

@@ -6,7 +6,7 @@ eval "$(
6 6
 )"
7 7
 
8 8
 makedepends=(${makedepends[@]/vulkan-headers/})
9
-makedepends_i686=(vulkan-headers)
9
+makedepends_i686+=(vulkan-headers)
10 10
 if [ "$CARCH" = 'i486' ]; then
11 11
   eval "$(
12 12
     declare -f build | \

+ 19
- 16
extra/subversion/PKGBUILD View File

@@ -1,17 +1,25 @@
1
+# no Java bindings on i486
2
+makedepends=(${makedepends[@]//java-environment<10/})
3
+makedepends_i686+=(java-environment<10)
4
+
5
+# no Ruby bindings on i486
6
+makedepends=(${makedepends[@]//ruby/})
7
+checkdepends=(${checkdepends[@]//ruby-test-unit/})
8
+makedepends_i686+=(ruby)
9
+checkdepends_i686+=(ruby-test-unit)
10
+
11
+# no KDE gui on i486
12
+makedepends=(${makedepends[@]//kdelibs4support/})
13
+makedepends=(${makedepends[@]//kwallet/})
14
+makedepends_i686+=(kdelibs4support kwallet)
15
+
16
+# no Gnome gui on i486
17
+makedepends=(${makedepends[@]//libgnome-keyring/})
18
+makedepends_i686+=(libgnome-keyring)
19
+
1 20
 # i486-specific
2 21
 if [ "${CARCH}" = "i486" ]; then
3
-  # no Apache server integration
4
-  makedepends=(${makedepends[@]//apache/})
5
-  eval "$(
6
-    declare -f build | \
7
-      sed '
8
-        s@--with-apxs@@
9
-        s@--with-apache-libexecdir=/usr/lib/httpd/modules@@
10
-      '
11
-  )"
12
-
13 22
   # no Java bindings
14
-  makedepends=(${makedepends[@]//java-environment<10/})
15 23
   eval "$(
16 24
     declare -f build | \
17 25
       sed '
@@ -28,8 +36,6 @@ if [ "${CARCH}" = "i486" ]; then
28 36
   )"
29 37
 
30 38
   # no Ruby bindings
31
-  makedepends=(${makedepends[@]//ruby/})
32
-  checkdepends=(${checkdepends[@]//ruby-test-unit/})
33 39
   eval "$(
34 40
     declare -f build | \
35 41
       sed '
@@ -51,8 +57,6 @@ if [ "${CARCH}" = "i486" ]; then
51 57
   )"
52 58
 
53 59
   # no KDE gui
54
-  makedepends=(${makedepends[@]//kdelibs4support/})
55
-  makedepends=(${makedepends[@]//kwallet/})
56 60
   eval "$(
57 61
     declare -f build | \
58 62
       sed '
@@ -61,7 +65,6 @@ if [ "${CARCH}" = "i486" ]; then
61 65
   )"
62 66
 
63 67
   # no Gnome gui
64
-  makedepends=(${makedepends[@]//libgnome-keyring/})
65 68
   eval "$(
66 69
     declare -f build | \
67 70
       sed '

+ 7
- 4
extra/wayland/PKGBUILD View File

@@ -1,10 +1,13 @@
1
+# no documentation on i486
2
+makedepends=(${makedepends[@]//graphviz/})
3
+makedepends=(${makedepends[@]//doxygen/})
4
+makedepends=(${makedepends[@]//xmlto/})
5
+makedepends=(${makedepends[@]//docbook-xsl/})
6
+makedepends_i686+=(graphviz doxygen xmlto docbook-xsl)
7
+
1 8
 # i486-specific
2 9
 if [ "${CARCH}" = "i486" ]; then
3 10
   # no documentation
4
-  makedepends=(${makedepends[@]//graphviz/})
5
-  makedepends=(${makedepends[@]//doxygen/})
6
-  makedepends=(${makedepends[@]//xmlto/})
7
-  makedepends=(${makedepends[@]//docbook-xsl/})
8 11
 
9 12
   eval "$(
10 13
     declare -f build | \

+ 1
- 1
multilib/fasm/PKGBUILD View File

@@ -1,4 +1,4 @@
1
-depends_i686=('glibc')
1
+depends_i686+=('glibc')
2 2
 
3 3
 eval "$(
4 4
   declare -f build | \