diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
| commit | 1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch) | |
| tree | 250019d7025db0f012d830cc7b257b091347f97f /package/openjdk7 | |
| parent | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff) | |
| parent | 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff) | |
resolve merge conflict
Diffstat (limited to 'package/openjdk7')
| -rw-r--r-- | package/openjdk7/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 9a1294329..701f67bca 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -26,7 +26,7 @@ WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} GCJ_VER:= 4.7.3 PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64 +PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_SYSTEM_DEPENDS:= !lemote-yeelong @@ -49,6 +49,9 @@ JDKARCH:= $(CPU_ARCH) ifeq ($(ARCH),x86) JDKARCH:= i386 endif +ifeq ($(CPU_ARCH),x86_64) +JDKARCH:= amd64 +endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) JDKARCH:= mipsel endif |