summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2020-04-04 08:56:36 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2020-04-04 08:56:36 +0200
commit3dcb46e2e5510696c5cc3bb26c688061dfbc27be (patch)
tree93911eb61bf368ae058c81bb9dd3cb29697e1e7c
parentd86430903c5619e59930bf80c02fe1637edfa522 (diff)
extra/rust: removed rustup patch and do some more precise per platform patching
-rw-r--r--extra/librsvg/PKGBUILD37
1 files changed, 18 insertions, 19 deletions
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index f5585f3..f982754 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/
- '
-)"