Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-07-03 13:01:59 +0200
committerErich Eckner <git@eckner.net>2019-07-03 13:01:59 +0200
commite5136b18c607f0e0d71ac0a2734d68896f8838ad (patch)
tree003270bebb0b41c54e875ae63639497d46ba314a
parentacb1feb5c1ff4ded22b90615bc19dab975cbfa13 (diff)
extra/java*-openjdk: unify patches
-rw-r--r--extra/java-openjdk/PKGBUILD12
-rw-r--r--extra/java10-openjdk/PKGBUILD12
-rw-r--r--extra/java11-openjdk/PKGBUILD12
-rw-r--r--extra/java7-openjdk/PKGBUILD11
-rw-r--r--extra/java8-openjdk/PKGBUILD1
5 files changed, 48 insertions, 0 deletions
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}-}"