Browse Source

fix build errors

Waldemar Brodkorb 11 years ago
parent
commit
77cf268edb
4 changed files with 7 additions and 7 deletions
  1. 1 1
      package/gconf/Makefile
  2. 1 0
      package/gpsd/Makefile
  3. 1 1
      package/intltool/Makefile
  4. 4 5
      package/orbit2/Makefile

+ 1 - 1
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}/

+ 1 - 0
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

+ 1 - 1
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

+ 4 - 5
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 \