diff options
Diffstat (limited to 'main/openjdk6')
| -rw-r--r-- | main/openjdk6/APKBUILD | 45 | ||||
| -rw-r--r-- | main/openjdk6/icedtea-jdk-no-lib-nsl-uclibc.patch (renamed from main/openjdk6/icedtea-jdk-no-lib-nsl.patch) | 0 |
2 files changed, 31 insertions, 14 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD index 600e5d0890..d0eb8a4bc0 100644 --- a/main/openjdk6/APKBUILD +++ b/main/openjdk6/APKBUILD @@ -11,8 +11,7 @@ license="GPL-2 with Classpath" depends="$pkgname-jre" options="sover-namecheck" makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux-ng - autoconf automake nss-dev cups-dev libjpeg-turbo-dev giflib-dev - libpng-dev libxt-dev + autoconf automake nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev libxp-dev libxtst-dev libxinerama-dev libiconv-dev libxrender-dev alsa-lib-dev freetype-dev xulrunner-dev gtk+2.0-dev ca-certificates libxslt zip" @@ -52,7 +51,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk- icedtea-hotspot-uclibc-fixes.patch icedtea-jdk-iconv-uclibc.patch icedtea-jdk-execinfo.patch - icedtea-jdk-no-lib-nsl.patch + icedtea-jdk-no-lib-nsl-uclibc.patch icedtea6-1.9.7-generate_cacerts-1.patch icedtea-jdk-no-soname.patch " @@ -75,21 +74,39 @@ unpack() { prepare() { cd "$_builddir" - - # Busybox sha256 does not support longopts - sed -e "s/--check/-c/g" -i Makefile.am - # gcj is broke after strict linking - sed -e "s/-o native-ecj/-o native-ecj -lgcj/g" -i Makefile.am - - cp ../icedtea-*.patch patches - patch -p0 < ../build-paxctl.patch - patch -p1 < ../icedtea6-1.9.7-generate_cacerts-1.patch + # Busybox sha256 does not support longopts + sed -e "s/--check/-c/g" -i Makefile.am + # gcj is broke after strict linking + sed -e "s/-o native-ecj/-o native-ecj -lgcj/g" -i Makefile.am + + for patch in $source; do + case $patch in + icedtea-*.patch) + case $patch in + *uclibc*) + if [ "$ALPINE_LIBC" != "eglibc" ]; then + cp ../$patch patches + _dpatches="$_dpatches patches/$patch" + fi + ;; + *) + cp ../$patch patches + _dpatches="$_dpatches patches/$patch" + ;; + esac + ;; + *.patch) + msg "Applying patch $patch" + patch -p1 -i "$srcdir"/$patch || return 1 + ;; + esac + done + export DISTRIBUTION_PATCHES="$_dpatches" } build() { export JAVA_HOME=$BOOTSTRAP_JAVA_HOME export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH - export DISTRIBUTION_PATCHES=`echo $source | awk -v RS=' ' '/icedtea-[^ ]*\.patch/ { printf "patches/%s ",$1 }'` JOBS=`echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p'` if [ "$JOBS" ]; then @@ -200,6 +217,6 @@ bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip dc6a1e28a97d897d7a1057c11696727d icedtea-hotspot-uclibc-fixes.patch 7c0814181e5adc0763c5c0a24b01d4cb icedtea-jdk-iconv-uclibc.patch dae2ba8b87e2106b53974ace07e4ca72 icedtea-jdk-execinfo.patch -c4bb40d5b1ff690b27900c5cd06bc1e5 icedtea-jdk-no-lib-nsl.patch +c4bb40d5b1ff690b27900c5cd06bc1e5 icedtea-jdk-no-lib-nsl-uclibc.patch 0bc0131c87fcc0d1046e3ba20d205c73 icedtea6-1.9.7-generate_cacerts-1.patch d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch" diff --git a/main/openjdk6/icedtea-jdk-no-lib-nsl.patch b/main/openjdk6/icedtea-jdk-no-lib-nsl-uclibc.patch index 26f89bb546..26f89bb546 100644 --- a/main/openjdk6/icedtea-jdk-no-lib-nsl.patch +++ b/main/openjdk6/icedtea-jdk-no-lib-nsl-uclibc.patch |