From 77cf268edb1eaf11a4bdcd2b54d1fd19a44c42bd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 25 Jun 2014 15:26:23 +0200
Subject: fix build errors
---
package/gconf/Makefile | 2 +-
package/gpsd/Makefile | 1 +
package/intltool/Makefile | 2 +-
package/orbit2/Makefile | 9 ++++-----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dfe962648..b8f8c72af 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 2b16996d0e4b112856ee5c59130e822c
PKG_DESCR:= system for storing application preferences
PKG_SECTION:= libs/misc
-PKG_BUILDDEP:= dbus dbus-glib orbit2
+PKG_BUILDDEP:= dbus dbus-glib orbit2 intltool-host
PKG_DEPENDS:= dbus dbus-glib orbit2
PKG_URL:= http://projects.gnome.org/gconf/
PKG_SITES:= ftp://ftp.gnome.org/pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 72a49d7a5..7107472de 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -24,6 +24,7 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GPSD_CLIENTS},${PKG_SECTION}))
+TARGET_CPPFLAGS:=
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
index 629064ecd..97202c81b 100644
--- a/package/intltool/Makefile
+++ b/package/intltool/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= https://launchpad.net/intltool/trunk/0.50.2/+download/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_ARCH_DEPENDS:= native
+PKG_CFLINE_INTLTOOL:= depends on ADK_HOST_ONLY
include $(ADK_TOPDIR)/mk/host.mk
include $(ADK_TOPDIR)/mk/package.mk
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 197909506..06200cec9 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -23,11 +23,10 @@ include $(ADK_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 env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags)
-LDFLAGS_FOR_BUILD+= -static
-LIBS_FOR_BUILD:= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --libs)
-LIBS_FOR_BUILD+= -lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0
-XAKE_FLAGS+= LIBS_FOR_BUILD="${LIBS_FOR_BUILD}"
+HOST_CFLAGS+= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --cflags)
+HOST_LDFLAGSD+= -static
+HOST_LIBS:= $(shell env $(HOST_CONFIGURE_ENV) libIDL-config-2 --libs)
+HOST_LIBS+= -lgmodule-2.0 -ldl -lpthread -lrt -lglib-2.0
CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \
ac_cv_alignof_CORBA_boolean=1 \
ac_cv_alignof_CORBA_char=1 \
--
cgit v1.2.3