extra/rust: removed rustup patch and do some more precise per platform patching

1 files changed, 18 insertions, 19 deletions

diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index f5585f33..f9827542 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,12 +1,23 @@
 # target Pentium 3 without SSE2
+if [ "$CARCH" = 'i686' ]; then
+	eval "$(
+	  declare -f prepare | \
+	    sed '
+	      /autogen.sh/ i sed -i \"s/\\\$(CARGO).* build/RUSTFLAGS=\\"-C target-cpu=pentium2 -C target-feature=-sse2\\" \\0/g\" Makefile.am
+	    '
+	)"
+fi
+# pentium4: target pentium3 with SSE2
+if [ "$CARCH" = 'pentium4' ]; then
+	eval "$(
+	  declare -f prepare | \
+	    sed '
+	      /autogen.sh/ i sed -i \"s/\\\$(CARGO).* build/RUSTFLAGS=\\"-C target-cpu=pentium3\\" \\0/g\" Makefile.am
+	    '
+	)"
+fi
 
-eval "$(
-  declare -f prepare | \
-    sed '
-      /autogen.sh/ i sed -i \"s/\\\$(CARGO).* build/RUSTFLAGS=\\"-C target-cpu=pentium3 -C target-feature=-sse2\\" \\0/g\" Makefile.am
-    '
-)"
-
+# do not kill slaves with massive parallel rust builds
 eval "$(
   declare -f build | \
     sed '
@@ -23,15 +34,3 @@ eval "$(
       s/make check/make check || true/
     '
 )"
-
-# use rust, not rustup, compiled rustc uses pentium3, non-SSE2 optimizations,
-# no clue what we get with rustup!
-
-makedepends=(${makedepends[@]//rustup/})
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      s/rustup/#rustup/
-    '
-)"