12 files changed, 236 insertions, 0 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index f9149e9d..e8479e7b 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -7,3 +7,24 @@ prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i "$srcdir/cmake-3.11.4-find-libuv.patch"
 }
+
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no Python Shinx
+  makedepends=(${makedepends[@]//python-sphinx/})
+  eval "$(
+    declare -f build | \
+      sed '
+        s/--sphinx-man//
+      '
+  )"
+
+  # no Qt5 GUI
+  makedepends=(${makedepends[@]//qt5-base/})
+  eval "$(
+    declare -f build | \
+      sed '
+        s/--qt-gui//
+      '
+  )"
+fi
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
new file mode 100644
index 00000000..d78c5181
--- /dev/null
+++ b/extra/git/PKGBUILD
@@ -0,0 +1,18 @@
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # we currently have no Gnome and libsecret, so disable integration
+  makedepends=(${makedepends[@]//libgnome-keyring/})
+  makedepends=(${makedepends[@]//libsecret/})
+  eval "$(
+    declare -f build | \
+      sed '
+        s@\(make -C contrib/credential/gnome-keyring\)@#\1@
+        s@\(make -C contrib/credential/libsecret\)@#\1@
+      '
+    declare -f package | \
+      sed '
+        /gnome-keyring/d
+        /libsecret/d
+      '
+  )"
+fi
diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD
new file mode 100644
index 00000000..a9b60ed8
--- /dev/null
+++ b/extra/jsoncpp/PKGBUILD
@@ -0,0 +1,18 @@
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no doxygen or graphviz
+  makedepends=(${makedepends[@]//doxygen/})
+  makedepends=(${makedepends[@]//graphviz/})
+  eval "$(
+    declare -f build | \
+      sed '
+        /python doxybuild.py/d
+      '
+    declare -f package_jsoncpp-doc | \
+      sed '
+        /cp -a dist\/doxygen/d
+      '
+  )"
+fi
+
+
diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD
new file mode 100644
index 00000000..cb18a7d9
--- /dev/null
+++ b/extra/libatomic_ops/PKGBUILD
@@ -0,0 +1,15 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # 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
diff --git a/extra/libatomic_ops/libatomic_ops-7.6.4-libatomic.patch b/extra/libatomic_ops/libatomic_ops-7.6.4-libatomic.patch
new file mode 100644
index 00000000..7b2674c2
--- /dev/null
+++ b/extra/libatomic_ops/libatomic_ops-7.6.4-libatomic.patch
@@ -0,0 +1,11 @@
+diff -rauN libatomic_ops-7.6.4/tests/Makefile.am libatomic_ops-7.6.4-libatomic-patch/tests/Makefile.am
+--- libatomic_ops-7.6.4/tests/Makefile.am	2018-03-27 09:06:11.000000000 +0000
++++ libatomic_ops-7.6.4-libatomic-patch/tests/Makefile.am	2018-07-18 19:39:32.145989353 +0000
+@@ -11,6 +11,7 @@
+         -I$(top_builddir)/tests -I$(top_srcdir)/tests
+ 
+ CFLAGS += $(CFLAGS_EXTRA)
++LDFLAGS += -latomic
+ 
+ TESTS = test_atomic$(EXEEXT) test_atomic_generalized$(EXEEXT) \
+         test_stack$(EXEEXT) test_malloc$(EXEEXT)
diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD
new file mode 100644
index 00000000..8bf87ab2
--- /dev/null
+++ b/extra/libunwind/PKGBUILD
@@ -0,0 +1,5 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no TeX for documentation
+  makedepends=(${makedepends[@]//texlive-core/})
+fi
diff --git a/extra/libuv/PKGBUILD b/extra/libuv/PKGBUILD
new file mode 100644
index 00000000..39ff340b
--- /dev/null
+++ b/extra/libuv/PKGBUILD
@@ -0,0 +1,17 @@
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no python sphinx
+  makedepends=(${makedepends[@]//python-sphinx/})
+  eval "$(
+    declare -f build | \
+      sed '
+        /make man/d
+      '
+    declare -f package | \
+      sed '
+        /install.*libuv/d
+      '
+  )"
+fi
+
+
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
new file mode 100644
index 00000000..f92fe1d3
--- /dev/null
+++ b/extra/mariadb/PKGBUILD
@@ -0,0 +1,21 @@
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no java
+  eval "$(
+    declare -f build | \
+      sed '
+        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
diff --git a/extra/mariadb/mariadb-10.1.32-atomic.patch b/extra/mariadb/mariadb-10.1.32-atomic.patch
new file mode 100644
index 00000000..42baf27c
--- /dev/null
+++ b/extra/mariadb/mariadb-10.1.32-atomic.patch
@@ -0,0 +1,79 @@
+diff -rauN mariadb-10.1.32/extra/mariabackup/CMakeLists.txt mariadb-10.1.32-atomic-patch/extra/mariabackup/CMakeLists.txt
+--- mariadb-10.1.32/extra/mariabackup/CMakeLists.txt	2018-03-26 16:18:02.000000000 +0200
++++ mariadb-10.1.32-atomic-patch/extra/mariabackup/CMakeLists.txt	2018-03-28 20:44:20.926068353 +0200
+@@ -86,7 +86,7 @@
+ ADD_SUBDIRECTORY(crc)
+ 
+ 
+-TARGET_LINK_LIBRARIES(mariabackup sql crc)
++TARGET_LINK_LIBRARIES(mariabackup sql crc atomic)
+ 
+ IF(NOT HAVE_SYSTEM_REGEX)
+   TARGET_LINK_LIBRARIES(mariabackup pcreposix)
+diff -rauN mariadb-10.1.32/libmysqld/CMakeLists.txt mariadb-10.1.32-atomic-patch/libmysqld/CMakeLists.txt
+--- mariadb-10.1.32/libmysqld/CMakeLists.txt	2018-03-26 16:18:02.000000000 +0200
++++ mariadb-10.1.32-atomic-patch/libmysqld/CMakeLists.txt	2018-03-28 20:48:26.807077308 +0200
+@@ -184,7 +184,9 @@
+     SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+     IF(LIBMYSQLD_SO_EXTRA_LIBS)
+-       TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS})
++       TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS} atomic)
++    ELSE()
++       TARGET_LINK_LIBRARIES(libmysqld atomic)
+     ENDIF()
+   ENDIF()
+ ENDIF()
+diff -rauN mariadb-10.1.32/libmysqld/examples/CMakeLists.txt mariadb-10.1.32-atomic-patch/libmysqld/examples/CMakeLists.txt
+--- mariadb-10.1.32/libmysqld/examples/CMakeLists.txt	2018-03-26 16:18:02.000000000 +0200
++++ mariadb-10.1.32-atomic-patch/libmysqld/examples/CMakeLists.txt	2018-03-28 20:49:49.911092297 +0200
+@@ -27,14 +27,14 @@
+ MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc
+                ../../client/mysql.cc ../../client/readline.cc
+                COMPONENT Client)
+-TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver)
++TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver atomic)
+ IF(UNIX)
+   TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY})
+ ENDIF(UNIX)
+ 
+ MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc
+   COMPONENT Test)
+-TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcre pcreposix)
++TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver pcre pcreposix atomic)
+ 
+ IF(CMAKE_GENERATOR MATCHES "Xcode")
+ # It does not seem possible to tell Xcode the resulting target might need
+@@ -53,7 +53,7 @@
+     COMPONENT Test)
+   SET_TARGET_PROPERTIES(mysql_client_test_embedded  PROPERTIES HAS_CXX TRUE)
+ ENDIF()
+-TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver)
++TARGET_LINK_LIBRARIES(mysql_client_test_embedded mysqlserver atomic)
+ 
+ IF(UNIX)
+ SET_TARGET_PROPERTIES(mysql_embedded PROPERTIES ENABLE_EXPORTS TRUE)
+diff -rauN mariadb-10.1.32/sql/CMakeLists.txt mariadb-10.1.32-atomic-patch/sql/CMakeLists.txt
+--- mariadb-10.1.32/sql/CMakeLists.txt	2018-03-26 16:18:03.000000000 +0200
++++ mariadb-10.1.32-atomic-patch/sql/CMakeLists.txt	2018-03-28 20:47:43.783551473 +0200
+@@ -276,7 +276,7 @@
+   ENDIF()
+ ENDIF(NOT WITHOUT_DYNAMIC_PLUGINS)
+ 
+-TARGET_LINK_LIBRARIES(mysqld sql)
++TARGET_LINK_LIBRARIES(mysqld sql atomic)
+ 
+ # Provide plugins with minimal set of libraries
+ SET(INTERFACE_LIBS ${LIBRT})
+diff -rauN mariadb-10.1.32/unittest/sql/CMakeLists.txt mariadb-10.1.32-atomic-patch/unittest/sql/CMakeLists.txt
+--- mariadb-10.1.32/unittest/sql/CMakeLists.txt	2018-03-26 16:18:05.000000000 +0200
++++ mariadb-10.1.32-atomic-patch/unittest/sql/CMakeLists.txt	2018-03-28 20:45:33.566958289 +0200
+@@ -27,7 +27,7 @@
+   ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc)
+ ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(explain_filename-t sql mytap)
++TARGET_LINK_LIBRARIES(explain_filename-t sql mytap atomic)
+ MY_ADD_TEST(explain_filename)
+ 
+ ADD_EXECUTABLE(mf_iocache-t mf_iocache-t.cc ../../sql/mf_iocache_encr.cc)
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
new file mode 100644
index 00000000..f644e426
--- /dev/null
+++ b/extra/nasm/PKGBUILD
@@ -0,0 +1,20 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # remove all fonts and ghostscript (we don't build the manual)
+  makedepends=(${makedepends[@]//perl-font-ttf/})
+  makedepends=(${makedepends[@]//perl-sort-versions/})
+  makedepends=(${makedepends[@]//fontconfig/})
+  makedepends=(${makedepends[@]//adobe-source-sans-pro-fonts/})
+  makedepends=(${makedepends[@]//ttf-liberation/})
+  makedepends=(${makedepends[@]//ghostscript/})
+
+  eval "$(
+    declare -f build | \
+      sed '
+        /make .*doc/d
+      '
+  )"
+fi
+
+# orginal download link unstable
+#sed -i 's@http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz@https://ftp.osuosl.org/pub/blfs/conglomeration/${pkgname}/${pkgname}-${pkgver}.tar.xz@' PKGBUILD
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index d13816e2..82e85edc 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -17,3 +17,9 @@ replaces=("${replaces[@]/$pkgname-multilib}")
 
 unset checkdepends
 unset check
+
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # disable OpenMPI support
+  makedepends=(${makedepends[@]//openmpi/})
+fi
diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD
new file mode 100644
index 00000000..913d7e12
--- /dev/null
+++ b/extra/w3m/PKGBUILD
@@ -0,0 +1,5 @@
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no imlib2
+  makedepends=(${makedepends[@]//imlib2/})
+fi