CVS: packaging README-MAINTAINER.txt, 1.6, 1.7 makefile, 1.29, 1.30

Chris Liechti <[email protected]> Mon, 26 May 2008 16:50:30 -0700
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/packaging
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30272

Modified Files:
	README-MAINTAINER.txt makefile 
Log Message:
- use binutils 2.18
- cleanup gdb/insight build section
- conditonally apply 64 bit patch to insight
- docs


Index: README-MAINTAINER.txt
===================================================================
RCS file: /cvsroot/mspgcc/packaging/README-MAINTAINER.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- README-MAINTAINER.txt	21 May 2008 02:10:14 -0000	1.6
+++ README-MAINTAINER.txt	26 May 2008 23:50:28 -0000	1.7
@@ -91,6 +91,18 @@
 
     SUBSYSTEM=="usb",ACTION=="add",SYSFS{idVendor}=="0451",SYSFS{idProduct}=="f430",SYSFS{bNumConfigurations}=="2",SYSFS{bConfigurationValue}=="1",RUN+="/bin/bash -c 'echo 2 > /sys%p/bConfigurationValue'"
 
+Notes
+-----
+I used the command line::
+
+    CC=gcc-3.4 time make MAKEINFO=/usr/bin/makeinfo build
+
+to build on Ubuntu 8.04.
+
+Insight additionally needs::
+
+    sudo apt-get install libx11-dev
+
 
 mspgcc Windows howto
 ====================

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/packaging/makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -d -r1.29 -r1.30
--- makefile	21 May 2008 02:10:21 -0000	1.29
+++ makefile	26 May 2008 23:50:28 -0000	1.30
@@ -40,11 +40,12 @@
 
 # versions
 #~ BINUTILS_VERSION        := 060404
-BINUTILS_VERSION        := 2.17
+BINUTILS_VERSION        := 2.18
 GCC_VERSION             := 3.2.3
 #~ GDB_VERSION             := 5.1.1
-GDB_VERSION             := 6.0
-INSIGHT_VERSION         := 6.7.1
+#~ GDB_VERSION             := 6.0
+GDB_VERSION             := 6.7.1
+#~ GDB_VERSION             := 6.8
 
 # location of the gnu source tarballs
 ARCHIVES        = $(PWD)/archives
@@ -74,16 +75,14 @@
 MIRROR          = ftp://sources.redhat.com/pub
 MIRROR_BINUTILS = $(MIRROR)/binutils/releases
 #MIRROR_BINUTILS = $(MIRROR)/binutils/snapshots
-MIRROR_GDB      = $(MIRROR)/gdb/old-releases
+#~ MIRROR_GDB      = $(MIRROR)/gdb/old-releases
 #~ MIRROR_GDB      = $(MIRROR)/gdb/releases
-MIRROR_INSIGHT  = $(MIRROR)/insight/releases
+MIRROR_GDB      = $(MIRROR)/insight/releases
 MIRROR_GCC      = ftp://ftp.gnu.org/gnu/gcc
 
 # inernal
 BINUTILS        = binutils-$(BINUTILS_VERSION)
 GCC             = gcc-$(GCC_VERSION)
-GDB             = gdb-$(GDB_VERSION)
-INSIGHT         = insight-$(INSIGHT_VERSION)
 
 # external tools
 NSIS           := makensis
@@ -139,7 +138,7 @@
 	@echo "    Archives are kept in '$(ARCHIVES)'"
 	@echo "    mspgcc patches are located in '$(CVSFILES)'"
 	@echo
-	@echo "    Versions: $(BINUTILS) $(GCC) $(GDB)"
+	@echo "    Versions: $(BINUTILS) $(GCC) insight-$(GDB_VERSION)"
 
 debug:
 	@echo BUILDDATE = $(BUILDDATE)
@@ -188,11 +187,8 @@
 $(ARCHIVES)/gcc-g++-$(GCC_VERSION).tar.bz2:
 	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_GCC)/gcc-$(GCC_VERSION)/gcc-g++-$(GCC_VERSION).tar.bz2
 
-$(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2:
-	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_GDB)/gdb-$(GDB_VERSION).tar.bz2
-
-$(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2:
-	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_INSIGHT)/insight-$(INSIGHT_VERSION).tar.bz2
+$(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2:
+	cd $(ARCHIVES) && $(DOWONLOAD) $(MIRROR_GDB)/insight-$(GDB_VERSION).tar.bz2
 
 ##############################################################################
 #### Build
@@ -200,7 +196,7 @@
 
 # The -clean rules delete the build folder, the -build rules depend on the
 # -clean rules, so that a build always starts in a fresh folder.
-# Once built, the -install target can be called more than once, witout
+# Once built, the -install target can be called more than once, without
 # triggering a complete rebuild
 binutils: binutils-build binutils-install
 gcc: gcc-build gcc-install
@@ -218,8 +214,11 @@
 	@echo "## Unpacking binutils"
 	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/$(BINUTILS).tar.bz2
 	@echo "## Applying extra mspgcc patches..."
-	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-14x1-20x1-20x2-20x3-22x4-42x-42x0-461x.patch
-	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-2.17-msp430x24x-msp430x26x.patch
+	#~ cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-14x1-20x1-20x2-20x3-22x4-42x-42x0-461x.patch
+	#~ cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-2.17-msp430x24x-msp430x26x.patch
+	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-2.18-14x1-20x1-20x2-20x3-22x4-42x-42x0-461x.patch
+	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-2.18-msp430x24x-msp430x26x.patch
+	cd $(BUILDDIR)/$(BINUTILS); patch -p1 < $(PATCHES)/binutils-ld_scripts.patch
 	@echo "## Configure and building binutils (this takes a while)"
 	cd $(BUILDDIR)/$(BINUTILS) && ./configure --target=msp430 $(CROSSOPT) --prefix=$(INSTALLDIR) \
                 --disable-nls --disable-shared --enable-debug --disable-threads \
@@ -279,50 +278,30 @@
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # The debugger
-#~ gdb-clean:
-	#~ @echo "###############################################################################"
-	#~ @echo "##  msp430-gdb ($(GDB_VERSION))"
-	#~ @echo "###############################################################################"
-	#~ rm -rf $(BUILDDIR)/$(GDB)
-#~ gdb-build: gdb-clean \
-            #~ $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
-	#~ cd $(BUILDDIR) && tar xjf $(ARCHIVES)/gdb-$(GDB_VERSION).tar.bz2
-	#~ @echo "## Applying mspgcc patches"
-	#~ #cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/$(GDB)
-	#~ cp -r $(CVSFILES)/gdb/gdb-current/* $(BUILDDIR)/$(GDB)
-	#~ @echo "## Configuring and building msp430-gdb (this takes a while)"
-	#~ cd $(BUILDDIR)/$(GDB); ./configure --target=msp430 --prefix=$(INSTALLDIR) --disable-nls >$(BUILDDIR)/gdb-build.log 2>&1
-	#~ cd $(BUILDDIR)/$(GDB); make >>$(BUILDDIR)/gdb-build.log 2>&1
-	#~ @echo "## msp430-gdb done"
-#~ gdb-install:
-	#~ $(FILELIST) $(INSTALLDIR) >files-before.txt
-	#~ cd $(BUILDDIR)/$(GDB); make install >>$(BUILDDIR)/gdb-build.log 2>&1
-	#~ $(FILELIST) $(INSTALLDIR) >files-after.txt
-	#~ $(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gdb.txt
-	#~ $(FILELIST_RM) files-before.txt files-after.txt
-	#~ @echo "## gdb installed"
-
-# alternative
 # provides gdb and insight
 gdb-clean:
 	@echo "###############################################################################"
-	@echo "##  msp430-insight ($(INSIGHT_VERSION))"
+	@echo "##  msp430-gdb/insight ($(GDB_VERSION))"
 	@echo "###############################################################################"
-	rm -rf $(BUILDDIR)/$(INSIGHT)
+	rm -rf $(BUILDDIR)/insight-$(GDB_VERSION)
 gdb-build: gdb-clean \
-            $(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2
-	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/insight-$(INSIGHT_VERSION).tar.bz2
+            $(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2
+	cd $(BUILDDIR) && tar xjf $(ARCHIVES)/insight-$(GDB_VERSION).tar.bz2
 	@echo "## Applying mspgcc patches"
-	#~ cp -r $(CVSFILES)/insight/insight-$(INSIGHT_VERSION)/* $(BUILDDIR)/$(INSIGHT)
-	cd $(BUILDDIR)/$(INSIGHT)&& patch -p1 < $(PATCHES)/insight-6.7.1-msp430-20080313.patch
-	#~ cd $(BUILDDIR)/$(INSIGHT); patch -p1 < $(PATCHES)/insight-6.8-msp430-20080516.patch
+	#~ cp -r $(CVSFILES)/gdb/gdb-$(GDB_VERSION)/* $(BUILDDIR)/insight-$(GDB_VERSION)
+	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-msp430-20080313.patch
+	uname -a | grep x86_64 && cd $(BUILDDIR)/insight-$(GDB_VERSION)&& patch -p1 < $(PATCHES)/insight-6.7.1-64bit.patch
 	@echo "## Configuring and building msp430-insight (this takes a while)"
-	cd $(BUILDDIR)/$(INSIGHT)&& ./configure --enable-targets=msp430 --target=msp430 --prefix=$(INSTALLDIR) --disable-nls >$(BUILDDIR)/insight-build.log 2>&1
-	cd $(BUILDDIR)/$(INSIGHT)&& make >>$(BUILDDIR)/insight-build.log 2>&1
+	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& ./configure \
+            --enable-targets=msp430 --target=msp430 \
+            --prefix=$(INSTALLDIR) \
+            --disable-nls \
+            >$(BUILDDIR)/gdb-build.log 2>&1
+	cd $(BUILDDIR)/insight-$(GDB_VERSION)&& make >>$(BUILDDIR)/gdb-build.log 2>&1
 	@echo "## msp430-insight done"
 gdb-install:
 	$(FILELIST) $(INSTALLDIR) >files-before.txt
-	cd $(BUILDDIR)/$(INSIGHT); make install >>$(BUILDDIR)/insight-build.log 2>&1
+	cd $(BUILDDIR)/insight-$(GDB_VERSION); make install >>$(BUILDDIR)/gdb-build.log 2>&1
 	$(FILELIST) $(INSTALLDIR) >files-after.txt
 	$(FILEDIFF) files-before.txt files-after.txt >$(BUILDDIR)/files-gdb.txt
 	$(FILELIST_RM) files-before.txt files-after.txt


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/