Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-05-18 21:34:39 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-05-18 21:34:39 +0200
commitdb765e47919d292b6472360659268f96fd178c23 (patch)
treef5f8825c46f5821912304fc082a08f931d5eb93f /extra
parent596df37da07d7d5a210cc36fc122aaf7827b7b15 (diff)
extra/java11-openjdk: fixes and bootstrapping for i486
Diffstat (limited to 'extra')
-rw-r--r--extra/java11-openjdk/PKGBUILD38
1 files changed, 23 insertions, 15 deletions
diff --git a/extra/java11-openjdk/PKGBUILD b/extra/java11-openjdk/PKGBUILD
index b1d50745..d3bf052b 100644
--- a/extra/java11-openjdk/PKGBUILD
+++ b/extra/java11-openjdk/PKGBUILD
@@ -1,21 +1,17 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- _JARCH=i386
-fi
+# set _JARCH to IA32
+_JARCH=x86
+
+# make sure -no-plt is set also for pentium4 and i486 (otherwise
+# we get GOT linking errors)
+eval "$(
+ declare -f build | \
+ sed '
+ /CARCH/s/i686/${CARCH}/
+ '
+)"
# pentium4-specific
if [ "${CARCH}" = "pentium4" ]; then
- _JARCH=x86
- _DOC_ARCH=x86
-
- # make sure -no-plt is set also for pentium4
- eval "$(
- declare -f build | \
- sed '
- /CARCH/s/i686/pentium4/
- '
- )"
-
# force 4-byte stack alignment on SSE aptimized systems, see FS32#75
eval "$(
declare -f build | \
@@ -28,4 +24,16 @@ if [ "${CARCH}" = "pentium4" ]; then
fi
+# fix location of images in case they are wrong
_imgdir="${_imgdir//--/-${_JARCH}-}"
+
+# pandoc is mainly broken currently (FS32#180)
+makedepends=(${makedepends[@]//pandoc/})
+
+# for some reason we cannot install java-environment=10 if it comes
+# from build-support only
+# also, we want to use the lowest version of java explicitely being
+# able to build Java 11 (which is 10)
+makedepends=(${makedepends[@]//java-environment>=10/})
+makedepends=(${makedepends[@]//java-environment<12/})
+makedepends+=(jdk10-openjdk)