diff options
| author | Francesco Colista <francesco.colista@gmail.com> | 2011-11-21 09:54:11 +0000 |
|---|---|---|
| committer | Francesco Colista <francesco.colista@gmail.com> | 2011-11-21 09:54:11 +0000 |
| commit | 5e37dd18f128363abfe4687ee09c8f9cf77aa692 (patch) | |
| tree | fa07930e68b6a070ac23733700234373deaa6e1d /main/openjdk6/APKBUILD | |
| parent | 549ff8d1efc5845bc4c1bfd717181bf19f84a31e (diff) | |
| parent | 68459d5fbd3af0219648c785883e3d2e3d11ba39 (diff) | |
| download | aports-5e37dd18f128363abfe4687ee09c8f9cf77aa692.tar.bz2 aports-5e37dd18f128363abfe4687ee09c8f9cf77aa692.tar.xz | |
Merge git://dev.alpinelinux.org/aports
Diffstat (limited to 'main/openjdk6/APKBUILD')
| -rw-r--r-- | main/openjdk6/APKBUILD | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD index e38f48cff5..27c8d9ec51 100644 --- a/main/openjdk6/APKBUILD +++ b/main/openjdk6/APKBUILD @@ -3,7 +3,7 @@ pkgname=openjdk6 pkgver=1.6.0_p22 icedteaver=1.10.4 -pkgrel=2 +pkgrel=4 pkgdesc="Sun OpenJDK 6 via IcedTea" url="http://icedtea.classpath.org/" arch="all" @@ -13,7 +13,7 @@ makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux- 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" + gtk+2.0-dev ca-certificates" install="" subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc:doc" @@ -41,6 +41,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk- icedtea-jdk-iconv-uclibc.patch icedtea-jdk-execinfo.patch icedtea-jdk-no-lib-nsl.patch + icedtea6-1.9.7-generate_cacerts-1.patch " _builddir="$srcdir/icedtea6-$icedteaver" @@ -69,6 +70,7 @@ prepare() { cp ../icedtea-*.patch patches patch -p0 < ../build-paxctl.patch + patch -p1 < ../icedtea6-1.9.7-generate_cacerts-1.patch } build() { @@ -84,12 +86,15 @@ build() { fi cd "$_builddir" + sh autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ --disable-dependency-tracking \ + --enable-cacerts \ + --with-ca-dir=/etc/ssl/certs \ --with-gcj $confjobs \ --with-openjdk-src-zip=$srcdir/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz \ --with-jaxp-drop-zip=$srcdir/$JAXP_DROP_ZIP \ @@ -101,7 +106,7 @@ build() { --with-xalan2-serializer-jar=$srcdir/xalan-j_$XALAN2_VER/serializer.jar \ --with-xerces2-jar=$srcdir/xerces-${XERCES_VER//./_}/xercesImpl.jar \ --with-rhino=$srcdir/rhino$RHINO_VER/js.jar \ - --with-pkgversion=Alpine \ + --with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \ || return 1 make || return 1 @@ -182,4 +187,5 @@ 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.patch +0bc0131c87fcc0d1046e3ba20d205c73 icedtea6-1.9.7-generate_cacerts-1.patch" |