[gcc-6] 123/401: * Default the 32bit x86 architectures to i686, keep i585 symlinks. See https://lists.debian.org/debian-devel/2015/09/msg00589.html

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 8dae5dc439c31e452f99405b8a3f1ba6b7b371b7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Apr 28 16:30:02 2016 +0000

      * Default the 32bit x86 architectures to i686, keep i585 symlinks.
        See https://lists.debian.org/debian-devel/2015/09/msg00589.html
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8800 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  2 ++
 debian/rules.defs | 21 +++++++++++++++++----
 debian/rules2     | 12 +++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ed663c..3c15936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ gcc-6 (6.1.0-1) UNRELEASED; urgency=medium
   * Add missing libstdc++ symbol to symbols file.
   * libstdc++-doc: Ignore warnings about formulas and long identifiers in
     man pages.
+  * Default the 32bit x86 architectures to i686, keep i585 symlinks.
+    See https://lists.debian.org/debian-devel/2015/09/msg00589.html
 
  -- Matthias Klose <doko at debian.org>  Thu, 28 Apr 2016 10:31:38 +0200
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 996fd0a..1de5cda 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -75,13 +75,19 @@ ifeq ($(derivative),Ubuntu)
     endif
   endif
 else
-  ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy))
+  ifneq (,$(filter $(distrelease),lenny etch squeeze wheezy))
+    # keep dpkg defaults
+  else ifneq (,$(filter $(distrelease),jessie))
     ifeq ($(DEB_BUILD_GNU_TYPE),i486-linux-gnu)
       DEB_BUILD_GNU_TYPE = i586-linux-gnu
     endif
     ifeq ($(DEB_HOST_GNU_TYPE),i486-linux-gnu)
       DEB_HOST_GNU_TYPE	= i586-linux-gnu
     endif
+  else
+    # stretch and newer ...
+    DEB_BUILD_GNU_TYPE := $(subst i586,i686,$(DEB_BUILD_GNU_TYPE))
+    DEB_HOST_GNU_TYPE := $(subst i586,i686,$(DEB_HOST_GNU_TYPE))
   endif
 endif
 
@@ -144,9 +150,16 @@ DEB_TARGET_GNU_TYPE	:= $(call vafilt,$(TARGET_VARS),DEB_HOST_GNU_TYPE)
 DEB_TARGET_GNU_SYSTEM	:= $(call vafilt,$(TARGET_VARS),DEB_HOST_GNU_SYSTEM)
 DEB_TARGET_MULTIARCH	:= $(call vafilt,$(TARGET_VARS),DEB_HOST_MULTIARCH)
 
-ifeq (,$(filter $(distrelease),dapper lucid))
-  ifeq ($(DEB_TARGET_GNU_TYPE),i486-linux-gnu)
-    DEB_TARGET_GNU_TYPE	= i586-linux-gnu
+ifeq ($(derivative),Ubuntu)
+  ifeq (,$(filter $(distrelease),dapper lucid))
+    ifeq ($(DEB_TARGET_GNU_TYPE),i486-linux-gnu)
+      DEB_TARGET_GNU_TYPE = i586-linux-gnu
+    endif
+  endif
+else
+  ifneq (,$(filter $(distrelease),stretch sid))
+    DEB_TARGET_GNU_TYPE := $(subst i586,i686,$(DEB_TARGET_GNU_TYPE))
+    i586_symlinks = $(if $(findstring i686,$(DEB_TARGET_GNU_TYPE)),yes)
   endif
 endif
 
diff --git a/debian/rules2 b/debian/rules2
index ee42342..95f9e07 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -583,8 +583,10 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 kfreebsd-i386 kfreebsd-amd64))
   else # Debian
     ifneq (,$(filter $(distrelease),etch lenny))
       CONFARGS += --with-arch-32=i486
-    else
+    else ifneq (,$(filter $(distrelease),squeeze wheezy jessie))
       CONFARGS += --with-arch-32=i586
+    else
+      CONFARGS += --with-arch-32=i686
     endif
   endif
 endif
@@ -2470,6 +2472,14 @@ debian/arch_binaries.all: $(foreach i,$(arch_binaries),$(binary_stamp)-$(i))
 binary-arch: debian/arch_binaries.all
 	dh_compress $(foreach p,$(shell echo `cat debian/arch_binaries.all`),-p$(p)) \
 	  -X.log.xz -X.sum.xz -X.java -X.c -X.txt -X.tag -X.map -XREADME.Bugs
+ifeq ($(i586_symlinks),yes)
+	cd debian; \
+	for x in $$(find `cat arch_binaries` -type l -name 'i686-*'); do \
+	  link=$$(echo $$x | sed 's/i686-/i586-/'); \
+	  tgt=$$(basename $$x); \
+	  echo "Adding symlink: $$link -> $$tgt"; \
+	  rm -f $$link; cp -a $$x $$link; \
+endif
 	dh_fixperms $(foreach p,$(shell echo `cat debian/arch_binaries.all`),-p$(p))
 	dh_gencontrol $(foreach p,$(shell echo `cat debian/arch_binaries`),-p$(p)) \
 	  -- -v$(DEB_VERSION) $(common_substvars)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git