From d7af8328c157d400cde1f1e683c944dbec0e5b50 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Thu, 20 May 2010 16:44:50 -0600 Subject: [PATCH] Update rules and README.debian. --- debian/README.Debian | 21 ++++++++++----------- debian/rules | 14 +++++--------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index d797bc0e..849c4e59 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,16 +1,15 @@ The msp430-gcc package is: -* Derived from the official GNU gcc-3.2.3.tar.gz available on any - GNU mirror, such as http://mirrors.dotsrc.org/gnu/gcc/gcc-3.2.3.tar.gz. +* Derived from the official GNU gcc-4.4.3.tar.gz available on any + GNU mirror, such as http://mirrors.dotsrc.org/gnu/gcc/gcc-core-4.4.3.tar.gz + and http://mirrors.dotsrc.org/gnu/gcc/gcc-g++-4.4.3.tar.gz -* Includes patches from mspgcc.sf.net. mspgcc.sf.net maintains much of its - changes to the gcc as a sparse tree for each version. The dpatch patch named - debian/patches/002-mspgcc-3.2.3-20080819.dpatch contains the modifications - to standard gcc-3.2.3 as a result of applying the mspgcc sparse tree from - their CVS checked out at date 2008-08-19. mspgcc CVS is available via - pserver at anonymous@mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc in the - gcc-3.3 module. Yes, the gcc-3.3 module is actually for gcc-3.2.x. +* Includes mspgcc4 patches from mspgcc.sf.net. mspgcc.sf.net maintains much of + its changes to the gcc as a sparse tree for each version. The dpatch patch + named debian/patches/ports-gcc-4.x.dpatch contains the modifications to + standard gcc-4.3.3 as a result of applying the mspgcc sparse tree from their + CVS checked out at date 2008-08-19. mspgcc CVS is available via pserver at + anonymous@mspgcc.cvs.sourceforge.net:/cvsroot/mspgcc in the gcc-4.x module. -* The dpatch patch named - debian/patches/003-mspgcc-3.2.3-20080819-FUNCTION.dpatch contains the patch +* The dpatch patch named debian/patches/gcc-4.4.3.dpatch contains the patch also provided in mspgcc.sf.net in the packaging module in patches/. diff --git a/debian/rules b/debian/rules index daed7ea6..15233081 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ include /usr/share/dpatch/dpatch.make TARGET = msp430 package = $(TARGET)-gcc +version := $(shell head -1 debian/changelog | sed -e s'|^.*(\(.*\)-.*).*$$|\1|') CC = gcc CFLAGS = -g -O2 @@ -52,12 +53,7 @@ endif cd builddir \ && env CC="$(CC)" ../configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) --target=$(TARGET) --prefix=/usr \ - --disable-libc --disable-libssp \ - --disable-intl --disable-libiberty --with-gcc --with-gnu-ld \ - --with-gnu-as --with-stabs --disable-shared --disable-threads \ - --disable-win32-registry --disable-nls --enable-languages=c,c++ -# --disable-multilib --disable-libc --disable-libssp \ -# --with-pkgversion="GNU C/C++ for $(TARGET) on $(DISTRIBUTION)" + --enable-languages=c,c++ --with-pkgversion="MSPGCC4_$(version)" touch $@ @@ -115,13 +111,11 @@ ifeq ($(with_check),yes) debian/tmp/usr/share/doc/$(package)/ endif endif - $(install_file) BUGS COPYING COPYING.LIB FAQ MAINTAINERS README \ + $(install_file) COPYING COPYING.LIB MAINTAINERS README \ debian/README.Debian debian/tmp/usr/share/doc/$(package)/ $(install_file) ChangeLog debian/tmp/usr/share/doc/$(package)/changelog : # Remove unnecessary files installed rm -rf debian/tmp/usr/info debian/tmp/usr/lib/libiberty.a \ - debian/tmp/usr/share/man/man1/cpp* \ - debian/tmp/usr/share/man/man1/gcov* \ debian/tmp/usr/share/man/man7 : # Create links from usr/bin/msp430- to usr/msp430/bin/ $(install_dir) debian/tmp/usr/$(TARGET)/bin/ @@ -153,6 +147,8 @@ clean: unpatch -find . -name \*.gmo -o -name \*~ -o -name \*.info | xargs rm -f -rm -f $$(pwd)/test-summary* -rm -fr debian/patched debian/files* debian/substvars + -rm -f gcc/_gccver.h + -rm -fr mpfr/autom4te.cache/ -rm -f *-stamp -- 2.39.2