summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/bcm28xx-vc/Makefile2
-rw-r--r--package/glib/Makefile8
-rw-r--r--package/kodi/Makefile4
-rw-r--r--package/libiconv/Makefile3
4 files changed, 10 insertions, 7 deletions
diff --git a/package/bcm28xx-vc/Makefile b/package/bcm28xx-vc/Makefile
index 2c546b5f2..3de24d690 100644
--- a/package/bcm28xx-vc/Makefile
+++ b/package/bcm28xx-vc/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= https://github.com/raspberrypi/userland
PKG_SITES:= https://github.com/raspberrypi/userland.git
PKG_SUBPKGS:= BCM28XX_VC_TOOLS BCM28XX_VC_LIBS BCM28XX_VC_GL_LIBS BCM28XX_VC_DEBUG
-PKGSS_BCM28XX_VC_TOOLS:=bcm28XX-vc-libs
+PKGSS_BCM28XX_VC_TOOLS:=bcm28xx-vc-libs
PKGSC_BCM28XX_VC_TOOLS:=sys/hw
PKGSD_BCM28XX_VC_TOOLS:=videocore tools (vcgencmd,..)
PKGSC_BCM28XX_VC_LIBS:= libs/misc
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 7f85fe7c9..9e841acd6 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -12,7 +12,7 @@ PKG_DESCR:= low-level core library that forms the basis of gtk+
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP:= glib-host libffi zlib libelf dbus pcre
-HOST_BUILDDEP:= libffi-host python2-host gettext-host util-linux-host
+HOST_BUILDDEP:= libiconv-host libffi-host python2-host gettext-host util-linux-host
PKG_NEEDS:= threads intl iconv
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/
@@ -26,6 +26,8 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
ifeq ($(ADK_PACKAGE_LIBICONV),y)
CONFIGURE_ARGS+= --with-libiconv=yes
+else
+CONFIGURE_ARGS+= --with-libiconv=no
endif
CONFIGURE_ARGS+= --disable-mem-pools \
--disable-rebuilds \
@@ -45,13 +47,11 @@ HOST_STYLE:= auto
ifneq ($(OS_FOR_BUILD),CYGWIN)
HOST_CFLAGS+= -fPIC
endif
-ifneq ($(OS_FOR_BUILD),Darwin)
-HOST_CONFIGURE_ARGS+= --with-libiconv=no
-endif
HOST_CONFIGURE_ARGS+= --disable-fam \
--disable-dtrace \
--enable-static \
--with-pcre=bundled \
+ --with-libiconv=yes \
--disable-shared \
--disable-compile-warnings
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 4dca9b55a..5ee09cecc 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -17,8 +17,8 @@ PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses
PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid
PKG_DEPENDS+= taglib libjasper libmp3lame
PKG_DEPENDS+= libgpg-error python2-mod-sqlite libffmpeg
-PKG_DEPENDS+= libvorbisenc glib libdcadec
-PKG_BUILDDEP:= python2 libass ffmpeg rtmpdump
+PKG_DEPENDS+= libvorbisenc glib libdcadec bcm28xx-vc-gl-libs
+PKG_BUILDDEP:= python2 libass ffmpeg rtmpdump bcm28xx-vc
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis
PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host
PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index aeda38d00..d978dbba8 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -15,8 +15,10 @@ PKG_OPTS:= dev
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
+include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
libiconv-install:
@@ -24,4 +26,5 @@ libiconv-install:
$(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
$(CP) $(WRKINST)/usr/lib/libcharset.so* $(IDIR_LIBICONV)/usr/lib/
+include $(ADK_TOPDIR)/mk/host-bottom.mk
include $(ADK_TOPDIR)/mk/pkg-bottom.mk