From 763a7d577807bd623434caf64de151635e3537cb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 10 Oct 2013 10:24:25 +0200
Subject: fix orbit2 compile, disable tests, diable binutils for avr32

---
 package/binutils/Makefile                |  1 +
 package/libIDL/Makefile                  |  2 ++
 package/orbit2/Makefile                  |  5 ++---
 package/orbit2/patches/patch-Makefile_in | 11 +++++++++++
 scripts/scan-pkgs.sh                     |  4 ++++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 package/orbit2/patches/patch-Makefile_in

diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 43043514c..de0910fca 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -13,6 +13,7 @@ PKGSD_LIBBFD:=		Binary File Descriptor library
 PKGSC_LIBBFD:=		libs
 
 PKG_HOST_DEPENDS:=      !cygwin
+PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 8ffb0fe31..d5f01366a 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		glib
+PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 03e7cc974..3713ad403 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		ORBit2
 PKG_VERSION:=		2.14.19
 PKG_EXTRAVER:=		2.14
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		87c69c56c6d0bdafa4de5e18ae115cc9
 PKG_DESCR:=		a CORBA 2.4-compliant Object Request Broker
 PKG_SECTION:=		libs
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libIDL
 PKG_URL:=		http://projects.gnome.org/ORBit2/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 
-PKG_ARCH_DEPENDS:=	!arm !cris
+PKG_ARCH_DEPENDS:=	!cris
 
 PKG_SUBPKGS:=		ORBIT2 ORBIT2_DEV
 PKGSD_ORBIT2_DEV:=	orbit2 headers
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
 
 CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
-CFLAGS_FOR_BUILD+=	-I/usr/local/include -I/usr/include
 LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
 LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \
diff --git a/package/orbit2/patches/patch-Makefile_in b/package/orbit2/patches/patch-Makefile_in
new file mode 100644
index 000000000..6db688b9d
--- /dev/null
+++ b/package/orbit2/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- ORBit2-2.14.19.orig/Makefile.in	2010-09-28 11:39:41.000000000 +0200
++++ ORBit2-2.14.19/Makefile.in	2013-10-10 10:22:00.000000000 +0200
+@@ -296,7 +296,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-SUBDIRS = linc2 src include test docs
++SUBDIRS = linc2 src include docs
+ bin_SCRIPTS = orbit2-config
+ EXTRA_DIST = \
+ 	ORBit2.m4	\
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index dbce88a86..f5322f16b 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -77,6 +77,10 @@ if [[ -n $ADK_PACKAGE_LIBVPX ]]; then
 	NEED_YASM="$NEED_YASM libvpx"
 fi
 
+if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
+	NEED_LIBIDL="$NEED_LIBIDL orbit2"
+fi
+
 if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
 	NEED_YASM="$NEED_YASM firefox"
 	NEED_LIBIDL="$NEED_LIBIDL firefox"
-- 
cgit v1.2.3