From f1590c8f1e959054b9426d923886246c2abec3c1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 14 Nov 2013 13:54:40 +0100
Subject: fix orbit2 compile, use libIDL-host

---
 package/gettext-tiny/Makefile | 1 +
 package/glib/Makefile         | 3 +--
 package/libIDL/Makefile       | 7 ++++++-
 package/orbit2/Makefile       | 6 +++---
 4 files changed, 11 insertions(+), 6 deletions(-)

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 \
-- 
cgit v1.2.3