summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-01-11 19:52:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2018-01-11 19:52:47 +0100
commit9ca35e7ead58b872cca3ff9d7e3976863f8f8715 (patch)
tree6e558706ecb42f2fcc854cdfea87bf71c6a6a89b
parente667945f49bd8c4350cacc0764c7082340145a6c (diff)
libiconv symbol was removed
-rw-r--r--package/Makefile2
-rw-r--r--package/cups/Makefile2
-rw-r--r--package/glib/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/package/Makefile b/package/Makefile
index 2a04ad047..4cc797176 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -26,7 +26,7 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y))
HOST_COMPILE_PACKAGES:=$(patsubst %,%-host-compile,$(hostpackage-y))
INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
-ifeq ($(ADK_TARGET_LIBICONV),y)
+ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y)
COMPILE_ICONV:=libiconv-compile
INSTALL_ICONV:=libiconv-install
endif
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 086896562..dc2aaa967 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -25,7 +25,7 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-ifeq ($(ADK_TARGET_LIBICONV),y)
+ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y)
TARGET_LDFLAGS+= -liconv
endif
diff --git a/package/glib/Makefile b/package/glib/Makefile
index dd818f5a4..57e9b8f74 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -24,7 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
-ifeq ($(ADK_TARGET_LIBICONV),y)
+ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y)
CONFIGURE_ARGS+= --with-libiconv=yes
endif
CONFIGURE_ARGS+= --disable-mem-pools \