Browse Source

minor fixes

Waldemar Brodkorb 10 years ago
parent
commit
29949a05b6
4 changed files with 4 additions and 6 deletions
  1. 1 1
      mk/vars.mk
  2. 2 2
      package/libICE/Makefile
  3. 1 1
      package/libSM/Makefile
  4. 0 2
      package/vala/Makefile

+ 1 - 1
mk/vars.mk

@@ -53,7 +53,7 @@ PACKAGE_DIR:=		$(FW_DIR)/packages
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 
 # PATH variables
-TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
+TARGET_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${TOOLCHAIN_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
 

+ 2 - 2
package/libICE/Makefile

@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		4b8dae73fce37e994c3a6fa05d6db7ca
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xtrans-host xtrans xproto-host xproto libICE-host
+PKG_BUILDDEP:=		xtrans xproto
+HOST_BUILDDEP:=		xtrans-host xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libice
 PKG_OPTS:=		dev
@@ -23,7 +24,6 @@ $(eval $(call HOST_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
 libice-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib

+ 1 - 1
package/libSM/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		1d507651e9fa50aab7ef11be9e0e2f20
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libuuid
-PKG_BUILDDEP:=		libSM-host libICE util-linux
+PKG_BUILDDEP:=		libICE util-linux
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libsm
 PKG_OPTS:=		dev

+ 0 - 2
package/vala/Makefile

@@ -14,8 +14,6 @@ HOST_BUILDDEP:=		glib-host
 PKG_URL:=		https://wiki.gnome.org/Vala
 PKG_SITES:=		http://download.gnome.org/sources/vala/0.24/
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk