Fix bug 927073 - Binary compatibility broken for maintenance releases due to strict version-script - regression fix. r=glandium,a=Standard8 for check to Thunderbird-specific relbranch DONTBUILD GECKO2411esr_2013111803_RELBRANCH THUNDERBIRD_24_1_1_BUILD1 THUNDERBIRD_24_1_1_RELEASE
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 05 Nov 2013 12:07:22 +0100
branchGECKO2411esr_2013111803_RELBRANCH
changeset 148670 73cf17fcf5d55c42e433d825c2c8496e06051755
parent 148669 eb27490fde252cd8594bab47fdcc4698027df417
child 148671 753a0c581771801c3673c4742d1d1b95dbfb11d9
push id66
push userbugzilla@standard8.plus.com
push dateMon, 18 Nov 2013 11:01:14 +0000
reviewersglandium, Standard8
bugs927073
milestone24.1.1
Fix bug 927073 - Binary compatibility broken for maintenance releases due to strict version-script - regression fix. r=glandium,a=Standard8 for check to Thunderbird-specific relbranch DONTBUILD
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -1810,17 +1810,17 @@ FIREFOX_VERSION=`cat $_topsrcdir/browser
 
 if test -z "$FIREFOX_VERSION"; then
     AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
 fi
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
-AC_DEFINE_UNQUOTED(MOZILLA_SYMBOLVERSION,"$MOZILLA_SYMBOLVERSION")
+AC_SUBST(MOZILLA_SYMBOLVERSION)
 
 MOZ_DOING_LTO(lto_is_enabled)
 
 dnl ========================================================
 dnl System overrides of the defaults for target
 dnl ========================================================
 
 case "$target" in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -222,17 +222,17 @@ dnl Get mozilla version from central mil
 dnl ==============================================================
 MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
 MOZILLA_UAVERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir -uaversion`
 MOZILLA_SYMBOLVERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir -symbolversion`
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
-AC_DEFINE_UNQUOTED(MOZILLA_SYMBOLVERSION,"$MOZILLA_SYMBOLVERSION")
+AC_SUBST(MOZILLA_SYMBOLVERSION)
 
 # Separate version into components for use in shared object naming etc
 changequote(,)
 MOZJS_MAJOR_VERSION=`echo $MOZILLA_VERSION | sed "s|\(^[0-9]*\)\.[0-9]*.*|\1|"`
 MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.\([0-9]*\).*|\1|"`
 MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"`
 IS_ALPHA=`echo $MOZILLA_VERSION | grep [ab]`