summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-02 07:47:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-02 07:47:49 +0200
commit29949a05b6be852c6ad2835b50087dac35b27023 (patch)
treebbb2fa3a6058afe2bbad3a5b1fe7eae91a41cc57
parenta4e07b8ba93799e1e67a636e7f5212c35706e2d1 (diff)
minor fixes
-rw-r--r--mk/vars.mk2
-rw-r--r--package/libICE/Makefile4
-rw-r--r--package/libSM/Makefile2
-rw-r--r--package/vala/Makefile2
4 files changed, 4 insertions, 6 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 96a42592d..19c43dbf3 100644
--- a/mk/vars.mk
+++ b/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}
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index b25a951ea..1c28200a8 100644
--- a/package/libICE/Makefile
+++ b/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
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index f17c209fc..aa77da957 100644
--- a/package/libSM/Makefile
+++ b/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
diff --git a/package/vala/Makefile b/package/vala/Makefile
index 5a84b76a4..b65810f84 100644
--- a/package/vala/Makefile
+++ b/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