Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/java-openjdk
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-05-20 09:16:09 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-05-20 09:16:09 +0200
commit70635ae50cb5a7ec268ab45174346c4f9031ebc4 (patch)
tree23c3c2f9e2ca75424b50e952dd8038e5d51c572a /extra/java-openjdk
parentfc4d59185e718f434992d15baadea301956a1680 (diff)
extra/java-openjdk: bootstrapping via jdk14
Diffstat (limited to 'extra/java-openjdk')
-rw-r--r--extra/java-openjdk/PKGBUILD43
1 files changed, 27 insertions, 16 deletions
diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD
index b1d50745..0feb2f6c 100644
--- a/extra/java-openjdk/PKGBUILD
+++ b/extra/java-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 | \
@@ -25,7 +21,22 @@ if [ "${CARCH}" = "pentium4" ]; then
_CXXFLAGS="${_CXXFLAGS} -mincoming-stack-boundary=2"
'
)"
-
fi
+# fix location of images in case they are wrong
_imgdir="${_imgdir//--/-${_JARCH}-}"
+
+# pandoc is mainly broken currently (FS32#180)
+makedepends=(${makedepends[@]//pandoc/})
+
+# bootstrapping via the latest version from build-support (14)
+makedepends=(${makedepends[@]//java-environment>=11/})
+makedepends+=(jdk14-openjdk)
+
+# ZGC garbage collector seems to be 64-bit only
+eval "$(
+ declare -f build | \
+ sed '
+ s/--with-jvm-features=zgc//
+ '
+)"