From b562cf5c6d5297a649383ac1f0836acda097c125 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 Oct 2018 14:11:24 +0200
Subject:  core/openssl-1.0: i486 should also activate the i686 switch

---
 core/openssl-1.0/PKGBUILD | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 core/openssl-1.0/PKGBUILD

diff --git a/core/openssl-1.0/PKGBUILD b/core/openssl-1.0/PKGBUILD
new file mode 100644
index 00000000..5475ccdb
--- /dev/null
+++ b/core/openssl-1.0/PKGBUILD
@@ -0,0 +1,11 @@
+eval "$(
+  declare -f build | \
+    sed '
+      /^\s*if .*i686/ {
+        s/\(['"'"'"]\?\)i686\1/i?86/
+        s/\[/[[/
+        s/]/]]/
+        s/==/=/
+      }
+    '
+)"
-- 
cgit v1.2.3-54-g00ecf


From 3b85411c43834ecca980d62bd484370574921d03 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 Oct 2018 16:16:58 +0200
Subject: java[78]-openjdk: treat i486 as i386, too

---
 extra/java7-openjdk/PKGBUILD | 1 +
 extra/java8-openjdk/PKGBUILD | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 extra/java7-openjdk/PKGBUILD

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
new file mode 100644
index 00000000..3e11f2e9
--- /dev/null
+++ b/extra/java7-openjdk/PKGBUILD
@@ -0,0 +1 @@
+[ "$CARCH" = "i486" ]   && _JARCH=i386
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index 69209bb8..bb369461 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -17,3 +17,5 @@ eval "$(
        s/-Wno-error=deprecated-declarations/-Wno-error=deprecated-declarations -Wno-error=deprecated/
     '
 )"
+
+[ "$CARCH" = "i486" ]   && _JARCH=i386
-- 
cgit v1.2.3-54-g00ecf


From 28661c21f2d971cd535b4c713c71640e49884a2f Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 18 Oct 2018 16:21:11 +0200
Subject: extra/java7-openjdk: some i486 bootstrapping added

---
 extra/java7-openjdk/PKGBUILD | 20 +++++++++++++++++++-
 extra/java8-openjdk/PKGBUILD | 20 +++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 3e11f2e9..3e010da8 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1 +1,19 @@
-[ "$CARCH" = "i486" ]   && _JARCH=i386
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  _JARCH=i386
+
+  # a lot of things missing during bootstrapping
+  makedepends=(${makedepends[@]//libpulse>=0.9.11/})
+  makedepends=(${makedepends[@]//gtk2/})
+  makedepends=(${makedepends[@]//java-rhino/})
+  makedepends=(${makedepends[@]//eclipse-ecj/})
+
+  eval "$(
+    declare -f build | \
+      sed '
+        s|--with-rhino|--without-rhino|
+        s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
+      '
+  )"
+
+fi
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index bb369461..e1f5e163 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -18,4 +18,22 @@ eval "$(
     '
 )"
 
-[ "$CARCH" = "i486" ]   && _JARCH=i386
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  _JARCH=i386
+
+  # a lot of things missing during bootstrapping
+  makedepends=(${makedepends[@]//libpulse>=0.9.11/})
+  makedepends=(${makedepends[@]//gtk2/})
+  makedepends=(${makedepends[@]//java-rhino/})
+  makedepends=(${makedepends[@]//eclipse-ecj/})
+
+  eval "$(
+    declare -f build | \
+      sed '
+        s|--with-rhino|--without-rhino|
+        s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
+      '
+  )"
+
+fi
-- 
cgit v1.2.3-54-g00ecf