13 files changed, 269 insertions, 0 deletions
diff --git a/core/autoconf/PKGBUILD b/core/autoconf/PKGBUILD
index 1957adf9..320aba12 100644
--- a/core/autoconf/PKGBUILD
+++ b/core/autoconf/PKGBUILD
@@ -6,3 +6,21 @@ if [ "${pkgname}-${pkgver}-${pkgrel}" = autoconf-2.69-4 ]; then
       '
   )"
 fi
+
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # testing the go macros requires a running go actually
+  checkdepends+=('gcc-go')
+
+  # autoconf: 351 Go: https://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00000.html,
+  # see FS#57870 (closed upstream)
+  source+=('autoconf-2.69-go-test-351-OpenFile.patch')
+  md5sums+=('a7e1e05d4372b2ef5fae29b59e677e7d')
+  eval "$(
+    declare -f prepare | \
+      sed '
+        /patch -p1.*libtool/ a \
+        patch -Np1 -i "${srcdir}/autoconf-2.69-go-test-351-OpenFile.patch"
+      '
+  )"
+fi
diff --git a/core/autoconf/autoconf-2.69-go-test-351-OpenFile.patch b/core/autoconf/autoconf-2.69-go-test-351-OpenFile.patch
new file mode 100644
index 00000000..b69f423d
--- /dev/null
+++ b/core/autoconf/autoconf-2.69-go-test-351-OpenFile.patch
@@ -0,0 +1,21 @@
+diff -rauN autoconf-2.69/lib/autoconf/go.m4 autoconf-2.69-go-test-351-OpenFile-patch/lib/autoconf/go.m4
+--- autoconf-2.69/lib/autoconf/go.m4	2012-01-21 14:46:39.000000000 +0100
++++ autoconf-2.69-go-test-351-OpenFile-patch/lib/autoconf/go.m4	2018-03-16 16:46:23.323273368 +0100
+@@ -61,7 +61,7 @@
+ # Produce source that performs I/O.
+ m4_define([_AC_LANG_IO_PROGRAM(Go)],
+ [AC_LANG_PROGRAM([import ( "fmt"; "os" )],
+-[f, err := os.Open("conftest.out", os.O_CREATE|os.O_WRONLY, 0777)
++[f, err := os.OpenFile("conftest.out", os.O_CREATE|os.O_WRONLY, 0777)
+  if err != nil {
+ 	fmt.Println(err)
+ 	os.Exit(1)
+@@ -107,7 +107,7 @@
+ 	"os"
+ )
+ ],
+-[f, err := os.Open("conftest.val", os.O_CREATE|os.O_WRONLY, 0777)
++[f, err := os.OpenFile("conftest.val", os.O_CREATE|os.O_WRONLY, 0777)
+  if err != nil {
+ 	os.Exit(1)
+  }
diff --git a/core/automake/PKGBUILD b/core/automake/PKGBUILD
new file mode 100644
index 00000000..af9256a9
--- /dev/null
+++ b/core/automake/PKGBUILD
@@ -0,0 +1,5 @@
+# 486-specific: we have no Vala or Java at the moment
+if [ "${CARCH}" = "i486" ]; then
+  checkdepends=(${checkdepends[@]//vala/})
+  checkdepends=(${checkdepends[@]//java-environment/})
+fi
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 30370bd8..12033416 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -21,3 +21,25 @@ eval "$(
       s,STRIP_STATIC ,\0usr/lib/libm.a ,
     '
 )"
+
+# 486-specific
+if [ "${CARCH}" = "i486" ]; then
+  # no gd for memory profiles
+  makedepends=(${makedepends[@]//gd/})
+
+  # disable multilib, we are on 32-bit only
+  eval "$(
+    declare -f build | \
+      sed '
+        s@--enable-multi-arch@--disable-multi-arch@
+      '
+  )"
+
+  # disable testing for now, we run out of memory
+  eval "$(
+    declare -f check | \
+      sed '
+        /make check/d
+      '
+  )"
+fi
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
new file mode 100644
index 00000000..e3e0d088
--- /dev/null
+++ b/core/openssl/PKGBUILD
@@ -0,0 +1,11 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  eval "$(
+    declare -f build | \
+      sed '
+        s@no-ssl3-method@no-ssl3-method no-ssl2 no-ssl3@
+        s@'i686'@'i486'@
+        s@'linux-elf'@'linux-generic32'@
+      '
+  )"
+fi
diff --git a/core/pcre2/PKGBUILD b/core/pcre2/PKGBUILD
new file mode 100644
index 00000000..da90f860
--- /dev/null
+++ b/core/pcre2/PKGBUILD
@@ -0,0 +1,13 @@
+# 486-specific: we have no Vala or Java at the moment
+if [ "${CARCH}" = "i486" ]; then
+  # pcre2 configure, overload CFLAGS and CXXFLAGS to avoid optimization
+  # using MMX registers (default in gcc)
+  # disable JIT, contains hard coded XMM registers
+  eval "$(
+    declare -f build | \
+      sed '
+        s@./configure@CFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ./configure@
+        s/--enable-jit/--disable-jit/
+      '
+  )"
+fi
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/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/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