From: R. Steve McKown Date: Thu, 20 May 2010 14:40:54 +0000 (-0600) Subject: Update debian rules, changelog; add test-summary X-Git-Tag: debian/2.20-1tmi X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=commitdiff_plain;h=7179a7ac5f9b09ddf47a21143395c166ac5f2f82 Update debian rules, changelog; add test-summary --- diff --git a/debian/changelog b/debian/changelog index 0b79f4f..3dc5310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +msp430-binutils (2.20-1tmi) hardy; urgency=low + + * Update to binutils-2.20 + + -- TMI Packages Thu, 20 May 2010 07:40:52 -0600 + msp430-binutils (2.18.1~cvs20080103-2tmi) hardy; urgency=low * Note location of original binutils source used in README.Debian. diff --git a/debian/rules b/debian/rules index 5731283..7ca5798 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ rootname = binutils package = $(TARGET)-$(rootname) CC = gcc -CFLAGS = -g -O2 +CFLAGS = -g -O2 # warning: mspgcc4 script as of 5/1/2010 doesn't use -O2 STRIP = strip --strip-unneeded --remove-section=.comment --remove-section=.note install_dir = install -d -m 755 @@ -54,9 +54,7 @@ endif cd builddir \ && env CC="$(CC)" ../configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) --target=$(TARGET) --prefix=/usr \ - --disable-nls --disable-shared --enable-debug --disable-threads \ - --with-gcc --with-gnu-as --with-gnu-ld --with-stabs \ -# --disable-multilib + --disable-werror --disable-nls # --with-pkgversion="GNU Binutils for $(TARGET) on $(DISTRIBUTION)" $(MAKE) -C builddir configure-host touch $@ @@ -66,18 +64,18 @@ build: build-stamp build-stamp: configure-stamp $(checkdir) $(MAKE) -C builddir $(NJOBS) CFLAGS="$(CFLAGS)" -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) ifeq ($(with_check),yes) -$(MAKE) -C builddir -k \ CFLAGS="$(CFLAGS)" check + : # ld isn't checked by top level in 2.20 + -$(MAKE) -C builddir/ld -k \ + CFLAGS="$(CFLAGS)" check cat builddir/binutils/binutils.sum \ builddir/gas/testsuite/gas.sum \ builddir/ld/ld.sum >> $$(pwd)/test-summary @-[ -x /usr/bin/python ] \ - && echo "Test results, compared with installed binutils:" \ - && zcat /usr/share/doc/binutils/test-summary.gz > test-summary-installed \ - && python debian/test-suite-compare.py test-summary-installed test-summary -endif + && echo "Test results, compared with expected results:" \ + && python debian/test-suite-compare.py debian/test-summary test-summary endif touch $@ @@ -89,10 +87,10 @@ install-stamp: checkroot build-stamp $(install_dir) debian/tmp $(MAKE) -C builddir prefix=$$(pwd)/debian/tmp/usr \ mandir=$$(pwd)/debian/tmp/usr/share/man install - #obstack.h? configure.1? rm -rf debian/tmp/usr/share/man/man1/msp430-c++filt* \ debian/tmp/usr/bin/msp430-c++filt debian/tmp/usr/lib* \ - debian/tmp/usr/info debian/tmp/usr/share/locale + debian/tmp/usr/share/info + ifeq ($(with_strip),yes) $(STRIP) $$(file debian/tmp/usr/bin/* | awk -F: '$$0 !~ /script/ {print $$1}') endif @@ -118,34 +116,21 @@ binary-arch: checkroot build install $(install_dir) debian/tmp/usr/share/lintian/overrides $(install_file) debian/$(package).lintian-overrides \ debian/tmp/usr/share/lintian/overrides/$(package) -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -ifeq ($(with_check),yes) - $(install_file) $$(pwd)/test-summary \ - debian/tmp/usr/share/doc/$(package)/ -endif -endif - $(install_file) binutils/NEWS debian/README.Debian \ + $(install_file) binutils/NEWS binutils/README debian/README.Debian \ debian/tmp/usr/share/doc/$(package)/ $(install_file) binutils/ChangeLog \ debian/tmp/usr/share/doc/$(package)/changelog for pkg in bfd gas gprof ld; do \ $(install_dir) debian/tmp/usr/share/doc/$(package)/$$pkg; \ done - $(install_file) bfd/ChangeLog bfd/PORTING bfd/TODO \ + $(install_file) bfd/ChangeLog bfd/PORTING bfd/README bfd/TODO \ debian/tmp/usr/share/doc/$(package)/bfd/ - $(install_file) gas/ChangeLog gas/NEWS \ + $(install_file) gas/ChangeLog gas/README gas/NEWS \ debian/tmp/usr/share/doc/$(package)/gas/ - $(install_file) gprof/ChangeLog gprof/TODO gprof/TEST \ + $(install_file) gprof/ChangeLog gprof/README gprof/TODO gprof/TEST \ debian/tmp/usr/share/doc/$(package)/gprof/ - $(install_file) ld/ChangeLog ld/TODO ld/NEWS \ + $(install_file) ld/ChangeLog ld/README ld/TODO ld/NEWS \ debian/tmp/usr/share/doc/$(package)/ld/ - : # These only exist in H. J. Lu releases not GNU ones. - for dir in binutils bfd gas gprof ld; do \ - if [ -f $$dir/ChangeLog.linux ]; then \ - $(install_file) $$dir/ChangeLog.linux \ - debian/tmp/usr/share/doc/$(package)/$$dir/; \ - fi; \ - done : # Copy bbconv.pl to the doc dir for use by interested people $(install_file) gprof/bbconv.pl \ debian/tmp/usr/share/doc/$(package)/gprof/. @@ -168,7 +153,8 @@ binary: binary-indep binary-arch clean: unpatch $(checkdir) -rm -rf debian/tmp builddir - -find . -name \*.gmo -o -name \*~ -o -name \*.info | xargs rm -f + -find . -name \*.gmo -o -name \*~ -o -name \*.info | \ + grep -v "binutils/sysroff.info | xargs rm -f -rm -f $$(pwd)/test-summary* -rm -fr debian/patched debian/files* debian/substvars -rm -f *-stamp