summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-18 13:09:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-18 13:09:46 +0200
commit3939891944b4049d1bad5b156fc7c59934553def (patch)
tree38dcd305f7894bcca8c1a527ce8df4bc569ee504
parent5e07616b4dcaa47983cb218da53ab152e13228ef (diff)
add -liconv for uclibc build
-rw-r--r--package/openjdk7/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 027309fbf..00085af7a 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -38,6 +38,10 @@ include $(TOPDIR)/mk/qemu.mk
$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+# uclibc needs -liconv
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
+TARGET_LIBS:= -liconv
+endif
# for UINTPTR_MAX in stdint.h
TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS
# segfaults with march=pentium-m/atom
@@ -89,6 +93,7 @@ MAKE_ENV+= ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \
OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \
+ OTHER_LDLIBS='$(TARGET_LIBS)' \
GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \
LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib