diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/gcc-base-version.diff | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 7423c41..09e7186 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gcc-5 (5.2.1-13) UNRELEASED; urgency=medium + + * Fix version macros in the plugin-header.h header. Closes: #793478. + + -- Matthias Klose <doko@ubuntu.com> Fri, 24 Jul 2015 14:36:26 +0200 + gcc-5 (5.2.1-12) experimental; urgency=medium * Update to SVN 20150723 (r226105, 5.2.1) from the gcc-5-branch. diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff index 3247118..f59b494 100644 --- a/debian/patches/gcc-base-version.diff +++ b/debian/patches/gcc-base-version.diff @@ -201,3 +201,28 @@ Index: b/src/gcc/configure.ac if test x$host != x$target; then libstdcxx_incdir="$target_alias/$libstdcxx_incdir" fi +@@ -1691,6 +1691,7 @@ + + changequote(,)dnl + gcc_BASEVER=`cat $srcdir/BASE-VER` ++gcc_FULLVER=`cat $srcdir/FULL-VER` + gcc_DEVPHASE=`cat $srcdir/DEV-PHASE` + gcc_DATESTAMP=`cat $srcdir/DATESTAMP` + if test -f $srcdir/REVISION ; then +@@ -1701,12 +1702,12 @@ + cat > plugin-version.h <<EOF + #include "configargs.h" + +-#define GCCPLUGIN_VERSION_MAJOR `echo $gcc_BASEVER | sed -e 's/^\([0-9]*\).*$/\1/'` +-#define GCCPLUGIN_VERSION_MINOR `echo $gcc_BASEVER | sed -e 's/^[0-9]*\.\([0-9]*\).*$/\1/'` +-#define GCCPLUGIN_VERSION_PATCHLEVEL `echo $gcc_BASEVER | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$/\1/'` ++#define GCCPLUGIN_VERSION_MAJOR `echo $gcc_FULLVER | sed -e 's/^\([0-9]*\).*$/\1/'` ++#define GCCPLUGIN_VERSION_MINOR `echo $gcc_FULLVER | sed -e 's/^[0-9]*\.\([0-9]*\).*$/\1/'` ++#define GCCPLUGIN_VERSION_PATCHLEVEL `echo $gcc_FULLVER | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$/\1/'` + #define GCCPLUGIN_VERSION (GCCPLUGIN_VERSION_MAJOR*1000 + GCCPLUGIN_VERSION_MINOR) + +-static char basever[] = "$gcc_BASEVER"; ++static char basever[] = "$gcc_FULLVER"; + static char datestamp[] = "$gcc_DATESTAMP"; + static char devphase[] = "$gcc_DEVPHASE"; + static char revision[] = "$gcc_REVISION"; |