1 files changed, 39 insertions, 24 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index ca56ff47..e5966c06 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}]}" = '9c769f13c09a6f24c393a9762474eded2f269d8966e7764d9160d62232a7919b' ]; then
-    sha256sums[${i}]='b2967ed2b41ac2841b4a367e1f39d698293fe69e95f180486436b5a10b375865'
+  if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then
+    sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894'
   fi
-  if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
-    sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
+  if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then
+    sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc'
   fi
 done
 
@@ -23,24 +23,39 @@ if [ ! "${CARCH}" = "i686" ]; then
   )"
 fi
 
+# patch pacman for automatic architecture detection (applied in wildcard patch above)
 source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch')
-sha256sums+=('e8d5f8979c4dfab49e7ac058846f2454b865c1da451e086c23e61034fd820c19')
-
-eval "$(
-  {
-    declare -f prepare || \
-    printf 'prepare() {\n}\n'
-  } \
-  | sed '
-    $i cd "$srcdir/$pkgname-$pkgver" \
-       patch -p1 -i ../replace-i686-by-pentium4-when-architecture-is-auto.patch
-  '
-)"
-
-# FAIL: test 600 (also 64-bit), ignore for now
-eval "$(
-  declare -f check | \
-    sed '
-      s/make\(.*\)check/make \1 check || true/
+sha256sums+=('6a7906bd28a57cbcff58d856ffefbbb9096a163aaff79913b4fac69d75d0028a')
+
+# not supported on i486 -fcf-protection
+# LTO currently no available 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
+
+# If this still applies, it only does for i486:
+if [ "${CARCH}" = "i486" ]; then
+# broken Python/asciidoc
+  eval "$(
+    declare -f build | \
+      sed '
+        /meson/s/-Ddoc=enabled/-Ddoc=disabled/
+      '
+  )"
+fi
+
+# gettext is linked against old ICU verison on i486, use ICU 72 stub
+if [ "${CARCH}" = "i486" ]; then
+  makedepends+=(icu72)
+fi
+
+sha256sums[0]='SKIP'