Merge branch 'master' into i486

3 files changed, 22 insertions, 26 deletions

diff --git a/extra-from-multilib b/extra-from-multilib
deleted file mode 100644
index b631e5c3..00000000
--- a/extra-from-multilib
+++ /dev/null
@@ -1 +0,0 @@
-cmucl
diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD
index cb18a7d9..b02be16c 100644
--- a/extra/libatomic_ops/PKGBUILD
+++ b/extra/libatomic_ops/PKGBUILD
@@ -1,15 +1,12 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # missing a -latomic when linking tests
-  source+=('libatomic_ops-7.6.4-libatomic.patch')
-  sha256sums+=('9309b11f4794c14c09f49df21aa9adb9e490db1d0bffa707af0a36db40e950cc')
+# missing a -latomic when linking tests
+source+=('libatomic_ops-7.6.4-libatomic.patch')
+sha256sums+=('9309b11f4794c14c09f49df21aa9adb9e490db1d0bffa707af0a36db40e950cc')
 
-  eval "$(
-    declare -f prepare | \
-      sed '
-        /}/ i \
-          patch -Np1 -i "$srcdir/libatomic_ops-7.6.4-libatomic.patch" \
-          autoreconf
-      '
-  )"
-fi
+eval "$(
+  declare -f prepare | \
+    sed '
+      /}/ i \
+        patch -Np1 -i "$srcdir/libatomic_ops-7.6.4-libatomic.patch" \
+        autoreconf
+    '
+)"
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index f92fe1d3..3f6a4f9c 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,3 +1,14 @@
+# add -latomic where needed
+# e.g.TARGET_LINK_LIBRARIES(mariabackup sql crc atomic)
+source+=('mariadb-10.1.32-atomic.patch')
+sha256sums+=('194e43ca5468d4f4634f45eed6aaf08865c2d351fcc500696d4dc578fe94902e')
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch -Np1.*openssl-1-1-0.patch/ a \ patch -Np1 -i "${srcdir}/mariadb-10.1.32-atomic.patch"
+    '
+)"
+
 # 486-specific
 if [ "${CARCH}" = "i486" ]; then
   # no java
@@ -7,15 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
         s/cmake /cmake -DCONNECT_WITH_JDBC=0 /
       '
   )"
-
-  # add -latomic where needed
-  # e.g.TARGET_LINK_LIBRARIES(mariabackup sql crc atomic)
-  source+=('mariadb-10.1.32-atomic.patch')
-  sha256sums+=('194e43ca5468d4f4634f45eed6aaf08865c2d351fcc500696d4dc578fe94902e')
-  eval "$(
-    declare -f prepare | \
-      sed '
-        /patch -Np1.*openssl-1-1-0.patch/ a \ patch -Np1 -i "${srcdir}/mariadb-10.1.32-atomic.patch"
-      '
-  )"
 fi