Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 29 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index 49623ffe0..2658c12dd 100644
--- a/Makefile
+++ b/Makefile
@@ -225,9 +225,6 @@ NO_ERROR=0
 	@echo "_PATH:=$$PATH" >>prereq.mk
 	@echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk
 	@echo "SHELL:=$$(which bash)" >>prereq.mk
-	@echo "BUILD_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk
-	@PKGCFGDIR=$$(eval pkg-config --variable pc_path pkg-config 2>/dev/null) >/dev/null ; \
-	echo "PKG_HOSTLIB_DIR:=$${PKGCFGDIR:-/usr/lib/pkgconfig}" >>prereq.mk
 	@env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \
 		CC='${CC}' CPPFLAGS='${CPPFLAGS}' \
 	    	bash scripts/scan-tools.sh
diff --git a/mk/build.mk b/mk/build.mk
index 75a1a914c..f5d62460f 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -28,8 +28,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PACKAGE_CLASSPATH=n \
-			ADK_PACKAGE_GPSD=n \
-			ADK_PACKAGE_GPSD_CLIENTS=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_CRYPTINIT=n \
@@ -616,6 +614,7 @@ bulkallmod:
 		$(GMAKE) prereq && \
 		$(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \
 		$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \
+		$(GMAKE) cleantarget; \
 		rm .config; \
             ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \
 	        if [ -f .exit ]; then break;fi \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 8eb84d7b1..69df75db1 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -16,6 +16,7 @@ PKG_DEPENDS+=		harfbuzz mesalib libvpx libbz2 ca-certificates libevent
 PKG_BUILDDEP:=		alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
 PKG_BUILDDEP+=		nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme
 PKG_BUILDDEP+=		libvpx pango gettext-tiny bzip2 libevent python2-host yasm-host
+PKG_BUILDDEP+=		zip-host
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -46,8 +47,6 @@ CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_LDFLAGS="${LDLAGS_FOR_BUILD}" \
 			HOST_CXX="${CXX_FOR_BUILD}" \
 			HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
-			BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \
-			PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \
 			HOST_RANLIB="ranlib" HOST_AR="ar" \
 			CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \
 			ac_cv_sqlite_secure_delete=yes \
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index 71fdda509..b483b838c 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -32,6 +32,7 @@ host-build:
 gettext-tiny-hostinstall:
 	${CP} ${WRKBUILD}/include/libintl.h ${STAGING_HOST_DIR}/usr/include
 	${CP} ${WRKBUILD}/libintl.a ${STAGING_HOST_DIR}/usr/lib
+	${CP} ${WRKBUILD}/{msgfmt,xgettext,msgmerge} ${STAGING_HOST_DIR}/usr/bin
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 842712601..ac93c981a 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -40,8 +40,7 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 
-HOST_CONFIGURE_ARGS+=	--prefix=$(HOST_WRKINST)/usr \
-			--disable-fam
+HOST_CONFIGURE_ARGS+=	--disable-fam
 
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 58a6f7434..aadcd7a17 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -10,21 +10,26 @@ PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
-PKG_BUILDDEP:=		glib flex-host bison-host
+PKG_BUILDDEP:=		glib-host glib flex-host bison-host libIDL-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 PKG_LIBNAME:=		libidl
 PKG_OPTS:=		dev
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 CONFIGURE_ENV+=		libIDL_cv_long_long_format=ll
 
+$(eval $(call HOST_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBIDL,libidl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+HOST_STYLE:=		auto
+
 libidl-install:
 	$(INSTALL_DIR) $(IDIR_LIBIDL)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libIDL*.so* \
 		$(IDIR_LIBIDL)/usr/lib
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index cc8774e89..618841d7d 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
 PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libIDL
+PKG_BUILDDEP:=		gettext-tiny glib-host libIDL-host libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		orbit2
@@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
-LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
+CFLAGS_FOR_BUILD+=	$(shell PATH=$(TARGET_PATH) libIDL-config-2 --cflags)
+LDFLAGS_FOR_BUILD+=	$(shell PATH=$(TARGET_PATH) libIDL-config-2 --libs)
 LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
 			ac_cv_alignof_CORBA_boolean=1 \
diff --git a/package/zip/Makefile b/package/zip/Makefile
index 1cc0f8ec0..242fc84ec 100644
--- a/package/zip/Makefile
+++ b/package/zip/Makefile
@@ -9,16 +9,20 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7b74551e63f8ee6aab6fbc86676c0d37
 PKG_DESCR:=		zip compression utility
 PKG_SECTION:=		archive
+PKG_BUILDDEP:=		zip-host
 PKG_URL:=		http://www.info-zip.org/Zip.html
 PKG_SITES:=		ftp://ftp.info-zip.org/pub/infozip/src/
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)30
 DISTFILES:=		$(PKG_NAME)30.tgz
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,ZIP,zip,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ZIP,zip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+HOST_STYLE:=		manual
 CONFIG_STYLE:=		minimal
 INSTALL_STYLE:=		manual
 
@@ -27,8 +31,20 @@ CONFIGURE_PROG:=	unix/configure
 MAKE_FILE:=		unix/Makefile
 ALL_TARGET:=		generic_gcc
 
+host-configure:
+	(cd $(WRKBUILD) && $(BASH) $(CONFIGURE_PROG))
+
+host-build:
+	(cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		${HOST_MAKE_FLAGS} ${ALL_TARGET})
+
+zip-hostinstall:
+	$(CP) $(WRKBUILD)/zip \
+		$(STAGING_HOST_DIR)/usr/bin
+
 zip-install:
 	${INSTALL_DIR} ${IDIR_ZIP}/usr/bin
 	${CP} ${WRKBUILD}/zip ${IDIR_ZIP}/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 874ee63a7..c90760b6e 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -69,17 +69,11 @@ if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
 	NEED_LIBIDL="$NEED_LIBIDL orbit2"
 fi
 
-if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
-	NEED_LIBIDL="$NEED_LIBIDL firefox"
-	NEED_ZIP="$NEED_ZIP firefox"
-fi
-
 if [[ -n $ADK_PACKAGE_MESALIB ]]; then
 	NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib"
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk"
 	NEED_GXX="$NEED_GXX openjdk"
 	NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
 fi
@@ -90,10 +84,6 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk7"
-fi
-
-if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
 	cd ${TOPDIR}/jtools; bash prereq.sh
 	[ $? -ne 0 ] && out=1
 fi
@@ -131,10 +121,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
 	NEED_GPERF="$NEED_GPERF eglibc"
 fi
 
-if [[ -n $ADK_PACKAGE_GLIB ]]; then
-	NEED_GETTEXT="$NEED_GETTEXT glib"
-fi
-
 if [[ -n $ADK_PACKAGE_YAJL ]]; then
 	NEED_RUBY="$NEED_RUBY yajl"
 fi
@@ -160,16 +146,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi"
 fi
 
-if [[ -n $NEED_GETTEXT ]]; then
-	if ! which gettext >/dev/null 2>&1; then
-		echo >&2 You need gettext to build $NEED_GETTEXT
-		out=1
-	elif ! which msgfmt >/dev/null 2>&1; then
-		echo >&2 You need msgfmt to build $NEED_GETTEXT
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_LIBTIRPCDEV ]];then
 	if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then
 		echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV
@@ -304,20 +280,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_ZIP ]]; then
-	if ! which zip >/dev/null 2>&1; then
-		echo >&2 You need zip to build $NEED_ZIP
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBIDL ]]; then
-	if ! which libIDL-config-2 >/dev/null 2>&1; then
-		echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_SWIG ]]; then
 	if ! which swig >/dev/null 2>&1; then
 		echo >&2 You need swig to build $NEED_SWIG