summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/ImageMagick/Makefile2
-rw-r--r--package/Makefile13
-rw-r--r--package/afpfs-ng/Makefile3
-rw-r--r--package/bitlbee/Makefile1
-rw-r--r--package/bogofilter/Makefile1
-rw-r--r--package/cdrkit/Makefile3
-rw-r--r--package/davfs2/Makefile3
-rw-r--r--package/dillo/Makefile1
-rw-r--r--package/dosfstools/Makefile3
-rw-r--r--package/fontconfig/Makefile1
-rw-r--r--package/fuse/Makefile1
-rw-r--r--package/gatling/Makefile3
-rw-r--r--package/gdb/Makefile3
-rw-r--r--package/glib/Makefile3
-rw-r--r--package/gmediaserver/Makefile3
-rw-r--r--package/gnutls/Makefile3
-rw-r--r--package/libiconv-tiny/Makefile2
-rw-r--r--package/mpd/Makefile3
-rw-r--r--package/openjdk7/Makefile2
-rw-r--r--package/parted/Makefile3
-rw-r--r--package/tvheadend/Makefile3
21 files changed, 13 insertions, 47 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 5e5bfa08d..a964fc954 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -19,8 +19,6 @@ PKG_LIBNAME:= libimagemagick
PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK
PKGSD_LIBIMAGEMAGICK:= imagemagick library
diff --git a/package/Makefile b/package/Makefile
index bfe4a0bd7..a5b851d02 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -35,6 +35,15 @@ 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)
+COMPILE_ICONV:=libiconv-compile
+INSTALL_ICONV:=libiconv-install
+endif
+ifeq ($(ADK_TARGET_LIBICONV_TINY),y)
+COMPILE_ICONV:=libiconv-tiny-compile
+INSTALL_ICONV:=libiconv-tiny-install
+endif
+
all: compile
download: $(patsubst %,%-download,$(package-y))
clean: $(patsubst %,%-clean,$(package-) $(package-y) base-files)
@@ -43,8 +52,8 @@ ifeq ($(ADK_TOOLCHAIN_ONLY),y)
compile: $(COMPILE_PACKAGES)
install: $(INSTALL_PACKAGES)
else
-compile: base-files-compile $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
+compile: base-files-compile $(COMPILE_ICONV) $(COMPILE_PACKAGES)
+install: base-files-install $(INSTALL_ICONV) $(INSTALL_PACKAGES)
endif
%-download:
diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
index 88f6f831c..38d013e31 100644
--- a/package/afpfs-ng/Makefile
+++ b/package/afpfs-ng/Makefile
@@ -16,9 +16,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
PKG_LIBNAME:= libafpclient
PKG_OPTS:= dev
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
PKG_SUBPKGS:= AFPFS_NG LIBAFPCLIENT
PKGSD_LIBAFPCLIENT:= afp client library
PKGSC_LIBAFPCLIENT:= libs/net
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index c386b7d54..532a90fda 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -14,7 +14,6 @@ PKG_BUILDDEP:= glib openssl
PKG_URL:= http://www.bitlbee.org/
PKG_SITES:= http://get.bitlbee.org/src/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 10f9fc0fc..7091e6717 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -14,7 +14,6 @@ PKG_DEPENDS:= libdb libstdcxx
PKG_URL:= http://bogofilter.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/}
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/cdrkit/Makefile b/package/cdrkit/Makefile
index e4c483bfe..cc0a8b4f8 100644
--- a/package/cdrkit/Makefile
+++ b/package/cdrkit/Makefile
@@ -13,9 +13,6 @@ PKG_DEPENDS:= libmagic zlib libbz2 libcap
PKG_BUILDDEP:= cmake-host file zlib bzip2 libcap
PKG_SITES:= http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 6e7789be8..9be3a3a26 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -14,8 +14,7 @@ PKG_BUILDDEP:= neon fuse
PKG_URL:= http://savannah.nongnu.org/projects/davfs2/
PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/
-PKG_LIBC_DEPENDS:= uclibc glibc
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
+PKG_LIBC_DEPENDS:= uclibc-ng glibc
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 9087a9e62..f1926bf60 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -17,7 +17,6 @@ PKG_SITES:= http://www.dillo.org/download/
PKG_HOST_DEPENDS:= !cygwin
PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index e06efe5ad..291f0231f 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -12,9 +12,6 @@ PKG_SECTION:= sys/fs
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/
PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 74c3c3638..edd846581 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -16,7 +16,6 @@ PKG_URL:= http://fontconfig.org/
PKG_SITES:= http://fontconfig.org/release/
PKG_OPTS:= dev
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${ADK_TOPDIR}/mk/host.mk
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index bfe52fd77..d1bf72e2a 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -16,7 +16,6 @@ PKG_LIBNAME:= libfuse
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
PKG_SUBPKGS:= FUSE_UTILS LIBFUSE
PKGSD_LIBFUSE:= filesystem in userspace library
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 894808f86..300d1690a 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -13,9 +13,6 @@ PKG_BUILDDEP:= libowfat
PKG_URL:= http://www.fefe.de/gatling/
PKG_SITES:= http://dl.fefe.de/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 85272567f..b244dd458 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -13,9 +13,6 @@ PKG_NOPARALLEL:= 1
PKG_ARCH_DEPENDS:= !m68k !avr32
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 695b16b9b..02ed182b7 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -18,9 +18,6 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/$(PKG_EXTRAVER)/
PKG_NOPARALLEL:= 1
PKG_OPTS:= dev noscripts
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index df5719dcb..4b755d9b4 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -17,8 +17,7 @@ PKG_CXX:= GMEDIASERVER
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:= uclibc glibc
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
+PKG_LIBC_DEPENDS:= uclibc-ng glibc
include ${ADK_TOPDIR}/mk/package.mk
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 88c5a5b29..75c2b8663 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -17,9 +17,6 @@ PKG_SITES:= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/
PKG_LIBNAME:= libgnutls
PKG_OPTS:= dev
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA
PKGSD_GNUTLS_UTILS:= transport layer security utilities
PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra
diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile
index 7687128fa..5a3328898 100644
--- a/package/libiconv-tiny/Makefile
+++ b/package/libiconv-tiny/Makefile
@@ -15,8 +15,6 @@ PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_LIBC_DEPENDS:= uclibc-ng uclibc
-
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 245192d4a..30db34055 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -15,9 +15,6 @@ PKG_BUILDDEP:= glib libmpdclient boost ncurses
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.19/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 1faef01c1..1e9572a64 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -21,8 +21,6 @@ PKG_DEPENDS+= libpng giflib libgtk2 glib fontconfig
PKG_URL:= http://openjdk.org/
PKG_SITES:= http://icedtea.classpath.org/download/source/
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
DISTFILES:= icedtea-$(PKG_VERSION).tar.xz
WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION}
diff --git a/package/parted/Makefile b/package/parted/Makefile
index e18e73f91..3f1a9b41f 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -14,9 +14,6 @@ PKG_BUILDDEP:= util-linux ncurses
PKG_URL:= http://www.gnu.org/software/parted/index.shtml
PKG_SITES:= $(MASTER_SITE_GNU:=parted/)
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
diff --git a/package/tvheadend/Makefile b/package/tvheadend/Makefile
index c85cc5f7e..b30d60e43 100644
--- a/package/tvheadend/Makefile
+++ b/package/tvheadend/Makefile
@@ -12,9 +12,6 @@ PKG_BUILDDEP:= openssl
PKG_URL:= https://tvheadend.org/projects/tvheadend
PKG_SITES:= https://github.com/tvheadend/tvheadend.git
-PKG_BUILDDEP_UCLIBC:= libiconv-tiny
-PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
-
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,TVHEADEND,tvheadend,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 15:09:55 +0000