1 files changed, 20 insertions, 12 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 7429bd4b..e7e5974b 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,14 +1,14 @@
-# upstream git revision: 18811ca7ee347721a700db2080a50df06a0a79fc
+# upstream git revision: 557099dcb495b55b563735a21fdc393d0fc050fb
 
 depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = '46a7fda0f2ebd2957db1c0264ed8a659df0916ba30e1353ecc70ef47d2b118ff' ]; then
-    sha256sums[${i}]='0af8eda66e530096cd4ff3e64f0b1ef2af669a7fb31b85faf9e6d906c6098ba1'
+  if [ "${sha256sums[${i}]}" = '072020e34f2c55b94a9a486829a7eadab0a830ddb4d8e759b0c4e6cf1bde73a6' ]; then
+    sha256sums[${i}]='2ad58ba534fed9d728d273c7b5920a495c15cfb58b5c3864bfa023a939abc5d0'
   fi
-  if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
-    sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
+  if [ "${sha256sums[${i}]}" = '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7' ]; then
+    sha256sums[${i}]='fa05e6f8a83f09fc347988a8ad9dce6fad50d542b2d77fc07fd1b604309990be'
   fi
 done
 
@@ -23,8 +23,9 @@ if [ ! "${CARCH}" = "i686" ]; then
   )"
 fi
 
+# patch pacman for automatic architecture detection
 source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch')
-sha256sums+=('e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19')
+sha256sums+=('6a7906bd28a57cbcff58d856ffefbbb9096a163aaff79913b4fac69d75d0028a')
 
 eval "$(
   {
@@ -37,10 +38,17 @@ eval "$(
   '
 )"
 
-# FAIL: test 600 (also 64-bit), ignore for now
-eval "$(
-  declare -f check | \
-    sed '
-      s/make\(.*\)check/make \1 check || true/
+# not supported on i486 -fcf-protection
+# LTO currently no availavle on i486
+if [ "${CARCH}" = "i486" ]; then
+  eval "$(
+    {
+      declare -f package || \
+      printf 'package() {\n}\n'
+    } \
+    | sed '
+      $i sed -i "s/-fcf-protection//g" "$pkgdir/etc/makepkg.conf"
+      $i sed -i "s/LTOFLAGS.*/LTOFLAGS=\\\"-fno-lto\\\"/" "$pkgdir/etc/makepkg.conf"
     '
-)"
+  )"
+fi