diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-10-18 16:21:11 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-10-18 16:21:11 +0200 |
| commit | 28661c21f2d971cd535b4c713c71640e49884a2f (patch) | |
| tree | 8a580d2bcc1aad3d58692c959751a40afd6b160b | |
| parent | 3b85411c43834ecca980d62bd484370574921d03 (diff) | |
| download | packages-28661c21f2d971cd535b4c713c71640e49884a2f.tar.xz | |
extra/java7-openjdk: some i486 bootstrapping added
| -rw-r--r-- | extra/java7-openjdk/PKGBUILD | 20 | ||||
| -rw-r--r-- | extra/java8-openjdk/PKGBUILD | 20 |
2 files changed, 38 insertions, 2 deletions
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 3e11f2e9..3e010da8 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1 +1,19 @@ -[ "$CARCH" = "i486" ] && _JARCH=i386 +# 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 bb369461..e1f5e163 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -18,4 +18,22 @@ eval "$( ' )" -[ "$CARCH" = "i486" ] && _JARCH=i386 +# 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 |