diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/openjdk7 | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'package/openjdk7')
-rw-r--r-- | package/openjdk7/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index d9c2f04de..b86680a7b 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -30,7 +30,7 @@ GCJ_VER:= 4.8.2 PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 -PKG_LIBC_DEPENDS:= uclibc eglibc glibc +PKG_LIBC_DEPENDS:= uclibc glibc PKG_SYSTEM_DEPENDS:= !lemote-yeelong include $(TOPDIR)/mk/host.mk |