From b7e54e97258a40e6d253b415c97afc91f1ac8d75 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 10 Jul 2011 20:12:53 +0000 Subject: [PATCH] [packages] crtmpserver: properly locate toolchain on backfire git-svn-id: svn://svn.openwrt.org/openwrt/packages@27580 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- multimedia/crtmpserver/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile index dd85a9497..a101915d2 100644 --- a/multimedia/crtmpserver/Makefile +++ b/multimedia/crtmpserver/Makefile @@ -44,10 +44,14 @@ server. For example, it enables you to do: * Simple/complex chat applications endef +# XXX: this hack handles the usr/bin vs bin difference of backfire and trunk +TS_BASE:=$(wildcard $(TOOLCHAIN_DIR)/bin/$(TARGET_CC)) +TS_BASE:=$(dir $(if $(TS_BASE),$(TS_BASE),$(wildcard $(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CC)))) + define Build/Configure (cd $(PKG_BUILD_DIR)/builders/make; \ cp linux.mk linux-openwrt-uclibc.mk; \ - $(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TOOLCHAIN_DIR)/bin/,' \ + $(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TS_BASE),' \ -e 's,^TOOLCHAIN_PREFIX[[:space:]]*=.*,TOOLCHAIN_PREFIX=$(TARGET_CROSS),' \ -e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \ -e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \ -- 2.11.0