From e5136b18c607f0e0d71ac0a2734d68896f8838ad Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 3 Jul 2019 13:01:59 +0200
Subject: extra/java*-openjdk: unify patches

---
 extra/java-openjdk/PKGBUILD   | 12 ++++++++++++
 extra/java10-openjdk/PKGBUILD | 12 ++++++++++++
 extra/java11-openjdk/PKGBUILD | 12 ++++++++++++
 extra/java7-openjdk/PKGBUILD  | 11 +++++++++++
 extra/java8-openjdk/PKGBUILD  |  1 +
 5 files changed, 48 insertions(+)
 create mode 100644 extra/java-openjdk/PKGBUILD
 create mode 100644 extra/java10-openjdk/PKGBUILD
 create mode 100644 extra/java11-openjdk/PKGBUILD

(limited to 'extra')

diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD
new file mode 100644
index 00000000..97c72063
--- /dev/null
+++ b/extra/java-openjdk/PKGBUILD
@@ -0,0 +1,12 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  _JARCH=i386
+fi
+
+# pentium4-specific
+if [ "${CARCH}" = "pentium4" ]; then
+  _JARCH=i386
+  _DOC_ARCH=x86
+fi
+
+_imgdir="${_imgdir//--/-${_JARCH}-}"
diff --git a/extra/java10-openjdk/PKGBUILD b/extra/java10-openjdk/PKGBUILD
new file mode 100644
index 00000000..97c72063
--- /dev/null
+++ b/extra/java10-openjdk/PKGBUILD
@@ -0,0 +1,12 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  _JARCH=i386
+fi
+
+# pentium4-specific
+if [ "${CARCH}" = "pentium4" ]; then
+  _JARCH=i386
+  _DOC_ARCH=x86
+fi
+
+_imgdir="${_imgdir//--/-${_JARCH}-}"
diff --git a/extra/java11-openjdk/PKGBUILD b/extra/java11-openjdk/PKGBUILD
new file mode 100644
index 00000000..97c72063
--- /dev/null
+++ b/extra/java11-openjdk/PKGBUILD
@@ -0,0 +1,12 @@
+# i486-specific
+if [ "${CARCH}" = "i486" ]; then
+  _JARCH=i386
+fi
+
+# pentium4-specific
+if [ "${CARCH}" = "pentium4" ]; then
+  _JARCH=i386
+  _DOC_ARCH=x86
+fi
+
+_imgdir="${_imgdir//--/-${_JARCH}-}"
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e8f34746..5015ea4a 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -7,3 +7,14 @@ makedepends_pentium4=("${makedepends_i686[@]}")
 if [ "${CARCH}" = "i486" ]; then
   _JARCH=i386
 fi
+
+# pentium4-specific
+if [ "${CARCH}" = "pentium4" ]; then
+  _JARCH=i386
+  _DOC_ARCH=x86
+fi
+
+_nonheadless=(
+  "${_nonheadless[@]/\/\///${_JARCH}/}"
+)
+_imgdir="${_imgdir//--/-${_JARCH}-}"
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index b6915954..e3275e2f 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -41,3 +41,4 @@ fi
 _nonheadless=(
   "${_nonheadless[@]/\/\///${_JARCH}/}"
 )
+_imgdir="${_imgdir//--/-${_JARCH}-}"
-- 
cgit v1.2.3-54-g00ecf