[gcc-6] 62/401: - add ibm branch logic

[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 23ed59376af15cff0f737366f8a57be8b6a7b882
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Jan 25 20:54:23 2016 +0000

     - add ibm branch logic
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8629 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.defs  | 7 +++++++
 debian/rules.patch | 4 ++++
 debian/rules2      | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/rules.defs b/debian/rules.defs
index 22fd2d4..edbc3df 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -370,6 +370,13 @@ endif
 
 with_linaro_branch =
 
+# build using fsf or the ibm branch
+ifeq ($(distribution),Ubuntu)
+  ifneq (,$(findstring $(DEB_TARGET_ARCH),ppc64el))
+    #with_ibm_branch = yes
+  endif
+endif
+
 # check if we're building for armel or armhf
 ifeq ($(DEB_TARGET_ARCH),armhf)
   float_abi := hard
diff --git a/debian/rules.patch b/debian/rules.patch
index 4ba7dd7..f15201e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -231,6 +231,10 @@ debian_patches += \
 	sys-auxv-header \
 	libcilkrts-targets \
 
+ifeq ($(with_ibm_branch),yes)
+  debian_patches += ibm-branch
+endif
+
 ifeq ($(with_softfloat),yes)
   debian_patches += arm-multilib-soft-float
 else ifeq ($(multilib),yes)
diff --git a/debian/rules2 b/debian/rules2
index 22026ba..bf02644 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -200,7 +200,7 @@ LDFLAGS_FOR_TARGET_TO_PASS = \
 docdir		= usr/share/doc
 
 CONFARGS = -v \
-	--with-pkgversion='$(distribution)$(if $(with_linaro_branch),/Linaro)___$(DEB_VERSION)' \
+	--with-pkgversion='$(distribution)$(if $(with_linaro_branch),/Linaro)$(if $(with_ibm_branch),/IBM)___$(DEB_VERSION)' \
 	--with-bugurl='file:///usr/share/doc/$(subst gcj,gcc,$(PKGSOURCE))/README.Bugs'
 
 CONFARGS += \

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