[Python-modules-commits] r3332 - /packages/pynxt/trunk/debian/rules

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Sun Sep 30 01:20:11 2007
New Revision: 3332

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3332
Log:
adding proper PATH settings and $MULTILIB_CONFIG changes

Modified:
    packages/pynxt/trunk/debian/rules

Modified: packages/pynxt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pynxt/trunk/debian/rules?rev=3332&op=diff
==============================================================================
--- packages/pynxt/trunk/debian/rules (original)
+++ packages/pynxt/trunk/debian/rules Sun Sep 30 01:20:11 2007
@@ -16,6 +16,7 @@
 #first find our build dependencies:
 GCC_SOURCE = $(shell dpkg -L gcc-4.2-source | grep "/usr/src/gcc-4.2/gcc-4.2.*.tar.bz2")
 GCC_DIR = $(shell tar tfj $(GCC_SOURCE) | head -1 | sed 's,/.*,,')
+MULTILIB_CONFIG=$(CURDIR)/$(GCC_DIR)/gcc/config/arm/t-arm-elf
 
 BINUTILS_SOURCE = $(shell dpkg -L binutils-source | grep "/usr/src/binutils/binutils-.*.tar.bz2")
 BINUTILS_DIR = $(shell tar tfj $(BINUTILS_SOURCE) | head -1 | sed 's,/.*,,')
@@ -23,7 +24,7 @@
 TOOLCHAIN_DIR=$(CURDIR)/toolchain
 
 flash_driver.bin: build-toolchain
-	export PATH=$(TOOLCHAIN_DIR):$$PATH ;\
+	export PATH=$(TOOLCHAIN_DIR)/bin:$$PATH ;\
 	    cd flash_write; $(MAKE)
 
 build-toolchain: build-binutils-stamp build-gcc-stamp
@@ -42,8 +43,10 @@
 build-gcc-stamp:
 	dh_testdir
 	tar xfj $(GCC_SOURCE)
+	echo "MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork" >> $(MULTILIB_CONFIG)
+	echo "MULTILIB_DIRNAMES += normal interwork" >> $(MULTILIB_CONFIG)
 	cd $(GCC_DIR) ;\
-	    export PATH=$(TOOLCHAIN_DIR):$$PATH ;\
+	    export PATH=$(TOOLCHAIN_DIR)/bin:$$PATH ;\
 	    ./configure --target=arm-elf --prefix=$(TOOLCHAIN_DIR) \
 	                --enable-interwork --enable-multilib --with-float=soft \
 	                --enable-languages="c" ;\