From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25614 invoked by alias); 18 Apr 2007 11:59:31 -0000 Received: (qmail 25605 invoked by uid 22791); 18 Apr 2007 11:59:30 -0000 X-Spam-Check-By: sourceware.org Received: from adelie.ubuntu.com (HELO adelie.ubuntu.com) (82.211.81.139) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 18 Apr 2007 12:59:26 +0100 Received: from hutte.ubuntu.com ([82.211.81.181]) by adelie.ubuntu.com with esmtp (Exim 4.60 #1 (Debian)) id 1He8ol-0002HI-20 for ; Wed, 18 Apr 2007 12:59:23 +0100 Received: from dslb-088-073-094-188.pools.arcor-ip.net ([88.73.94.188] helo=[192.168.42.7]) by hutte.ubuntu.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1He8ok-0005lh-Mp for binutils@sourceware.org; Wed, 18 Apr 2007 12:59:23 +0100 Message-ID: <46260809.2060104@ubuntu.com> Date: Wed, 18 Apr 2007 12:15:00 -0000 From: Matthias Klose User-Agent: Thunderbird 1.5.0.10 (X11/20070403) MIME-Version: 1.0 To: binutils@sourceware.org Subject: Re: [patch ping] binutils version of snapshot builds References: <46234A60.3050909@ubuntu.com> <20070416104326.GA22542@bubble.grove.modra.org> In-Reply-To: <20070416104326.GA22542@bubble.grove.modra.org> Content-Type: multipart/mixed; boundary="------------080508080603070408080203" X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2007-04/txt/msg00231.txt.bz2 This is a multi-part message in MIME format. --------------080508080603070408080203 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 208 Alan Modra schrieb: > On Mon, Apr 16, 2007 at 12:05:20PM +0200, Matthias Klose wrote: >> see http://sourceware.org/ml/binutils/2007-03/msg00285.html > > OK. updated patch to apply cleanly to current CVS: --------------080508080603070408080203 Content-Type: text/plain; name="binutils.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="binutils.diff" Content-length: 5219 bfd/ 2007-03-21 Matthias Klose * Makefile.am(libopcodes_la_LDFLAGS): Use bfd soversion. * Makefile.in: Regenerate. opcodes/ 2007-03-21 Matthias Klose * Makefile.am(libbfd_la_LDFLAGS): Use bfd soversion, (bfdver.h): Use the date in non-release builds for the soversion. * Makefile.in: Regenerate. --- ./opcodes/Makefile.am.orig 2007-04-14 22:45:09.000000000 +0200 +++ ./opcodes/Makefile.am 2007-04-18 13:28:48.000000000 +0200 @@ -362,7 +362,7 @@ # if host != build. libopcodes_la_DEPENDENCIES = $(OFILES) libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ -libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libopcodes.a. We create libopcodes.a in # the build directory so that we don't have to convert all the --- ./opcodes/Makefile.in.orig 2007-04-14 22:45:09.000000000 +0200 +++ ./opcodes/Makefile.in 2007-04-18 13:28:48.000000000 +0200 @@ -571,7 +571,7 @@ # if host != build. libopcodes_la_DEPENDENCIES = $(OFILES) libopcodes_la_LIBADD = $(OFILES) @WIN32LIBADD@ -libopcodes_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libopcodes_la_LDFLAGS = -release `cat ../bfd/libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libopcodes.a. We create libopcodes.a in # the build directory so that we don't have to convert all the --- ./bfd/Makefile.am.orig 2007-04-14 22:36:56.000000000 +0200 +++ ./bfd/Makefile.am 2007-04-18 13:33:21.000000000 +0200 @@ -746,7 +746,7 @@ libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@ -libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libbfd_la_LDFLAGS = -release `cat libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -962,23 +962,26 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h -DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) +DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ bfd_version_string="\"$(VERSION)\"" ;\ + bfd_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ + bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion # What appears below is generated by a hacked mkdep using gcc -MM. --- ./bfd/Makefile.in.orig 2007-04-14 22:36:56.000000000 +0200 +++ ./bfd/Makefile.in 2007-04-18 13:31:13.000000000 +0200 @@ -924,7 +924,7 @@ libbfd_la_SOURCES = $(BFD32_LIBS_CFILES) libbfd_la_DEPENDENCIES = $(OFILES) ofiles libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@ -libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@ +libbfd_la_LDFLAGS = -release `cat libtool-soversion` @WIN32LDFLAGS@ # libtool will build .libs/libbfd.a. We create libbfd.a in the build # directory so that we don't have to convert all the programs that use @@ -947,7 +947,7 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ stmp-bin2-h stmp-lbfd-h stmp-lcoff-h -DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) +DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1534,17 +1534,20 @@ @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ bfd_version_string="\"$(VERSION)\"" ;\ + bfd_soversion="$(VERSION)" ;\ bfd_version_package="\"$(PKGVERSION)\"" ;\ report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ if test "x$(RELEASE)" = x ; then \ bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ + bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ sed -e "s,@bfd_version@,$$bfd_version," \ -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion # What appears below is generated by a hacked mkdep using gcc -MM. --------------080508080603070408080203--