Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extra/java7-openjdk/PKGBUILD15
-rw-r--r--extra/java8-openjdk/PKGBUILD15
2 files changed, 30 insertions, 0 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 3e010da8..04ec4148 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -8,11 +8,26 @@ if [ "${CARCH}" = "i486" ]; then
makedepends=(${makedepends[@]//java-rhino/})
makedepends=(${makedepends[@]//eclipse-ecj/})
+ # readd implicit dependencies from above
+ makedepends+=(freetype2)
+ makedepends+=(fontconfig)
+ makedepends+=(cups)
+ makedepends+=(libxt)
+ makedepends+=(libxinerama)
+ makedepends+=(libxcomposite)
+ makedepends+=(libxtst)
+
eval "$(
declare -f build | \
sed '
+ s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu|
s|--with-rhino|--without-rhino|
s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
+ s|--enable-nss|--disable-nss|
+ s|./configure|./configure --disable-system-jpeg|
+ s|./configure|./configure --disable-system-lcms|
+ s|./configure|./configure --disable-system-gtk|
+ s|./configure|./configure --disable-compile-against-syscalls|
'
)"
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index e1f5e163..20c4d341 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -28,11 +28,26 @@ if [ "${CARCH}" = "i486" ]; then
makedepends=(${makedepends[@]//java-rhino/})
makedepends=(${makedepends[@]//eclipse-ecj/})
+ # readd implicit dependencies from above
+ makedepends+=(freetype2)
+ makedepends+=(fontconfig)
+ makedepends+=(cups)
+ makedepends+=(libxt)
+ makedepends+=(libxinerama)
+ makedepends+=(libxcomposite)
+ makedepends+=(libxtst)
+
eval "$(
declare -f build | \
sed '
+ s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu|
s|--with-rhino|--without-rhino|
s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
+ s|--enable-nss|--disable-nss|
+ s|./configure|./configure --disable-system-jpeg|
+ s|./configure|./configure --disable-system-lcms|
+ s|./configure|./configure --disable-system-gtk|
+ s|./configure|./configure --disable-compile-against-syscalls|
'
)"