diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-19 16:14:16 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-19 16:14:16 +0100 |
| commit | 63595c8c3f19a85d105a41da337aa2ca968f4098 (patch) | |
| tree | 7c7fe83a5e2b397161609b6c73b0c4e7dabd7833 /package/openjdk7 | |
| parent | b12d05eaac6fece851a48de9494b2855f17618db (diff) | |
| parent | 1abce8781525931b856754751e2595e68be74e0f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk7')
| -rw-r--r-- | package/openjdk7/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index ffc3a188f..3556f1c01 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -16,8 +16,10 @@ PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-h PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host nss PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny +PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc cups -PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss +PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo +PKG_DEPENDS+= libpng giflib libgtk glib fontconfig PKG_URL:= http://openjdk.org/ PKG_SITES:= http://icedtea.classpath.org/download/source/ @@ -67,17 +69,17 @@ CONFIGURE_COMMON:= --disable-docs \ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \ - --enable-nss \ --without-hotspot-build \ - --disable-system-jpeg \ + --enable-nss \ + --enable-system-zlib \ + --enable-system-jpeg \ + --enable-system-png \ + --enable-system-gif \ + --enable-system-gtk \ + --enable-system-gio \ + --enable-system-fontconfig \ --disable-system-lcms \ - --disable-system-zlib \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ --disable-system-kerberos \ - --disable-system-fontconfig \ --disable-compile-against-syscalls \ --without-rhino @@ -122,9 +124,9 @@ HOST_CONFIGURE_ARGS+=\ --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ --with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \ --without-hotspot-build \ + --disable-system-zlib \ --disable-system-jpeg \ --disable-system-lcms \ - --disable-system-zlib \ --disable-system-png \ --disable-system-gif \ --disable-system-gtk \ |