packaging/135_bfd_version.patch

   1 Author:
   2 Description: Description: Fix bfd version handling for extra builds
   3
   4 Index: binutils-2.21.0.20110216/bfd/Makefile.am
   5 ===================================================================
   6 --- binutils-2.21.0.20110216.orig/bfd/Makefile.am       2011-02-01 12:25:32.000000000 +0000
   7 +++ binutils-2.21.0.20110216/bfd/Makefile.am    2011-02-16 18:28:14.568229030 +0000
   8 @@ -948,14 +948,14 @@
   9
  10  bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
  11         @echo "creating $@"
  12 -       @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
  13 -       bfd_version_string="\"$(VERSION)\"" ;\
  14 +       @bfd_version=`echo "$(VERSION)" | sed -e 's/-.*$$//' | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
  15 +       bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`\"" ;\
  16         bfd_soversion="$(VERSION)" ;\
  17         bfd_version_package="\"$(PKGVERSION)\"" ;\
  18         report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
  19         if test "x$(RELEASE)" = x ; then \
  20           bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
  21 -         bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
  22 +         bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`.$${bfd_version_date}\"" ;\
  23           bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
  24         fi ;\
  25         sed -e "s,@bfd_version@,$$bfd_version," \
  26 Index: binutils-2.21.0.20110216/bfd/Makefile.in
  27 ===================================================================
  28 --- binutils-2.21.0.20110216.orig/bfd/Makefile.in       2011-02-01 12:25:32.000000000 +0000
  29 +++ binutils-2.21.0.20110216/bfd/Makefile.in    2011-02-16 18:28:34.248228995 +0000
  30 @@ -1980,14 +1980,14 @@
  31
  32  bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
  33         @echo "creating $@"
  34 -       @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
  35 -       bfd_version_string="\"$(VERSION)\"" ;\
  36 +       @bfd_version=`echo "$(VERSION)" | sed -e 's/-.*$$//' | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
  37 +       bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`\"" ;\
  38         bfd_soversion="$(VERSION)" ;\
  39         bfd_version_package="\"$(PKGVERSION)\"" ;\
  40         report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
  41         if test "x$(RELEASE)" = x ; then \
  42           bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
  43 -         bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
  44 +         bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`.$${bfd_version_date}\"" ;\
  45           bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
  46         fi ;\
  47         sed -e "s,@bfd_version@,$$bfd_version," \