diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/openjdk7 | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/openjdk7')
| -rw-r--r-- | package/openjdk7/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 8b9397bfa..cd0fa2646 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= openjdk7 PKG_VERSION:= 2.4.7 PKG_RELEASE:= 4 PKG_MD5SUM:= f6b28633b9978fadc724247cfc264ff0 -PKG_DESCR:= OpenJDK 7 Java VM -PKG_SECTION:= lang +PKG_DESCR:= java virtual machine +PKG_SECTION:= dev/lang PKG_BUILDDEP:= openjdk7-host 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 nss @@ -29,7 +29,6 @@ GCJ_VER:= 4.8.2 PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 PKG_LIBC_DEPENDS:= uclibc glibc -PKG_SYSTEM_DEPENDS:= !lemote-yeelong include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk |