[gcc-7] 88/354: * Configure --with-gcc-major-version-only, drop the gcc-base-version, gccgo-version and gdc-base-version patches.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit acdbe1f7990c8c84e2f04e053c38f7a7aa914662
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sat Jan 21 19:58:04 2017 +0000
* Configure --with-gcc-major-version-only, drop the gcc-base-version,
gccgo-version and gdc-base-version patches.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9240 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 11 +++--
debian/patches/gccgo-version.diff | 91 ------------------------------------
debian/patches/gdc-base-version.diff | 27 -----------
3 files changed, 7 insertions(+), 122 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5efa09..4ef9059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-gcc-7 (7-20170120-1) UNRELEASED; urgency=medium
+gcc-7 (7-20170121-1) UNRELEASED; urgency=medium
- * GCC 7 snapshot build, taken from the trunk 20170120.
- * Configure --with-gcc-major-version-only, drop the base version patch.
+ * GCC 7 snapshot build, taken from the trunk 20170121.
+ * Configure --with-gcc-major-version-only, drop the gcc-base-version,
+ gccgo-version and gdc-base-version patches.
+ * Adjust the g++-multiarch-incdir patch for reverted upstream patch,
+ causing bootstrap regression (PR 78880). Closes: #852104.
- -- Matthias Klose <doko at debian.org> Fri, 20 Jan 2017 13:43:07 +0100
+ -- Matthias Klose <doko at debian.org> Sat, 21 Jan 2017 20:34:04 +0100
gcc-7 (7-20170118-1) experimental; urgency=medium
diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff
deleted file mode 100644
index 9e15acb..0000000
--- a/debian/patches/gccgo-version.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-# DP: Omit the subminor number from the go libdir
-
-Index: b/src/gcc/go/Make-lang.in
-===================================================================
---- a/src/gcc/go/Make-lang.in
-+++ b/src/gcc/go/Make-lang.in
-@@ -222,7 +222,9 @@ go.stageprofile: stageprofile-start
- go.stagefeedback: stagefeedback-start
- -mv go/*$(objext) stagefeedback/go
-
--CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(version)\" \
-+short_version := $(shell echo $(version) | sed -r 's/([0-9]+).*/\1/')
-+
-+CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \
- -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\"
-
- GOINCLUDES = -I $(srcdir)/go -I $(srcdir)/go/gofrontend
-Index: b/src/libgo/Makefile.in
-===================================================================
---- a/src/libgo/Makefile.in
-+++ b/src/libgo/Makefile.in
-@@ -441,14 +441,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
- @LIBGO_IS_RTEMS_TRUE at subdirs = testsuite
- SUBDIRS = ${subdirs}
- gcc_version := $(shell $(GOC) -dumpversion)
-+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
- MAINT_CHARSET = latin1
- mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
- PWD_COMMAND = $${PWDCMD-pwd}
- STAMP = echo timestamp >
- toolexecdir = $(glibgo_toolexecdir)
- toolexeclibdir = $(glibgo_toolexeclibdir)
--toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
--libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(gcc_version)
-+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
-+libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(short_version)
- WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
-
- # -I/-D flags to pass when compiling.
-Index: b/src/libgo/Makefile.am
-===================================================================
---- a/src/libgo/Makefile.am
-+++ b/src/libgo/Makefile.am
-@@ -16,6 +16,7 @@ endif
- SUBDIRS = ${subdirs}
-
- gcc_version := $(shell $(GOC) -dumpversion)
-+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
-
- MAINT_CHARSET = latin1
-
-@@ -25,8 +26,8 @@ STAMP = echo timestamp >
-
- toolexecdir = $(glibgo_toolexecdir)
- toolexeclibdir = $(glibgo_toolexeclibdir)
--toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
--libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(gcc_version)
-+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
-+libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(short_version)
-
- LIBFFI = @LIBFFI@
- LIBFFIINCS = @LIBFFIINCS@
-Index: b/src/gotools/Makefile.am
-===================================================================
---- a/src/gotools/Makefile.am
-+++ b/src/gotools/Makefile.am
-@@ -18,8 +18,9 @@
- ACLOCAL_AMFLAGS = -I ./config -I ../config
-
- gcc_version := $(shell $(GCC_FOR_TARGET) -dumpversion)
-+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
-
--libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
-+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(short_version)
-
- mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
- PWD_COMMAND = $${PWDCMD-pwd}
-Index: b/src/gotools/Makefile.in
-===================================================================
---- a/src/gotools/Makefile.in
-+++ b/src/gotools/Makefile.in
-@@ -247,7 +247,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I ./config -I ../config
- gcc_version := $(shell $(GCC_FOR_TARGET) -dumpversion)
--libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
-+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
-+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(short_version)
- mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
- PWD_COMMAND = $${PWDCMD-pwd}
- STAMP = echo timestamp >
diff --git a/debian/patches/gdc-base-version.diff b/debian/patches/gdc-base-version.diff
deleted file mode 100644
index 6bf18e9..0000000
--- a/debian/patches/gdc-base-version.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-# DP: Use the GCC base version for the D include dir name
-
-Index: b/src/libphobos/m4/druntime.m4
-===================================================================
---- a/src/libphobos/m4/druntime.m4
-+++ b/src/libphobos/m4/druntime.m4
-@@ -43,7 +43,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
- AC_REQUIRE([AC_PROG_GDC])
-
- AC_MSG_CHECKING([D GCC version])
-- d_gcc_ver=`$GDC -dumpversion`
-+ d_gcc_ver=`$GDC -dumpversion | sed 's/^\(@<:@0-9@:>@*\).*/\1/'`
- AC_MSG_RESULT($d_gcc_ver)
- AC_ARG_WITH([cross-host],
- AC_HELP_STRING([--with-cross-host=HOST],
-Index: b/src/libphobos/configure.ac
-===================================================================
---- a/src/libphobos/configure.ac
-+++ b/src/libphobos/configure.ac
-@@ -53,6 +53,7 @@ m4_rename([_AC_ARG_VAR_PRECIOUS],[glibd_
- m4_define([_AC_ARG_VAR_PRECIOUS],[])
- AM_PROG_AS
- AC_PROG_CC
-+dnl dummy change to run autoreconf in this directory
- AC_PROG_GDC
- WITH_LOCAL_DRUNTIME([GDC_CHECK_COMPILE], [])
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list