diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:03:52 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:03:52 +0100 |
| commit | 5cf7479e89f0f84acd523186df3e31fbf7ad0c8d (patch) | |
| tree | 9cca3fa0080f8e24c842a51e1aad600ac4073388 | |
| parent | fbbbee85e67e67ceb9de12ecab5eee00692959d6 (diff) | |
| parent | 28661c21f2d971cd535b4c713c71640e49884a2f (diff) | |
| download | packages-5cf7479e89f0f84acd523186df3e31fbf7ad0c8d.tar.xz | |
Merge branch 'master' into i486
| -rw-r--r-- | core/openssl-1.0/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/java7-openjdk/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/java8-openjdk/PKGBUILD | 20 |
3 files changed, 50 insertions, 0 deletions
diff --git a/core/openssl-1.0/PKGBUILD b/core/openssl-1.0/PKGBUILD new file mode 100644 index 00000000..5475ccdb --- /dev/null +++ b/core/openssl-1.0/PKGBUILD @@ -0,0 +1,11 @@ +eval "$( + declare -f build | \ + sed ' + /^\s*if .*i686/ { + s/\(['"'"'"]\?\)i686\1/i?86/ + s/\[/[[/ + s/]/]]/ + s/==/=/ + } + ' +)" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD new file mode 100644 index 00000000..3e010da8 --- /dev/null +++ b/extra/java7-openjdk/PKGBUILD @@ -0,0 +1,19 @@ +# 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 69209bb8..e1f5e163 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -17,3 +17,23 @@ eval "$( s/-Wno-error=deprecated-declarations/-Wno-error=deprecated-declarations -Wno-error=deprecated/ ' )" + +# 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 |