Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:04:03 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:04:03 +0100
commit35c2cef0a5115fd45325bdbc847c59cdf3a0c401 (patch)
treebd3022b2a4540efdc7f561ecd78421d6d0b5d132 /extra
parent5cf7479e89f0f84acd523186df3e31fbf7ad0c8d (diff)
parenta21665f95f5a0173a34cecbbdb489b9bd0d159de (diff)
Merge branch 'master' into i486
Diffstat (limited to 'extra')
-rw-r--r--extra/java7-openjdk/PKGBUILD15
-rw-r--r--extra/java8-openjdk/PKGBUILD15
2 files changed, 0 insertions, 30 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 3e010da8..154fb2ee 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,19 +1,4 @@
# i486-specific
if [ "${CARCH}" = "i486" ]; then
_JARCH=i386
-
- # a lot of things missing during bootstrapping
- makedepends=(${makedepends[@]//libpulse>=0.9.11/})
- makedepends=(${makedepends[@]//gtk2/})
- makedepends=(${makedepends[@]//java-rhino/})
- makedepends=(${makedepends[@]//eclipse-ecj/})
-
- eval "$(
- declare -f build | \
- sed '
- s|--with-rhino|--without-rhino|
- s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
- '
- )"
-
fi
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index e1f5e163..0a99ad97 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -21,19 +21,4 @@ eval "$(
# i486-specific
if [ "${CARCH}" = "i486" ]; then
_JARCH=i386
-
- # a lot of things missing during bootstrapping
- makedepends=(${makedepends[@]//libpulse>=0.9.11/})
- makedepends=(${makedepends[@]//gtk2/})
- makedepends=(${makedepends[@]//java-rhino/})
- makedepends=(${makedepends[@]//eclipse-ecj/})
-
- eval "$(
- declare -f build | \
- sed '
- s|--with-rhino|--without-rhino|
- s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
- '
- )"
-
fi