[gcc-7] 102/354: * Fix some hppa64 related build issues. Addresses: #853023.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 16e423339a6a4f491bc8421d359183f2c123557a
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jan 31 11:36:25 2017 +0000

      * Fix some hppa64 related build issues. Addresses: #853023.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9268 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 12 +++++++++---
 debian/rules.conf |  6 +-----
 debian/rules.defs |  5 ++++-
 debian/rules2     | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83101ba..efe19a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-gcc-7 (7-20170126-1) experimental; urgency=medium
+gcc-7 (7-20170129-2) UNRELEASED; urgency=medium
 
-  * GCC 7 snapshot build, taken from the trunk 20170126.
+  * Fix some hppa64 related build issues. Addresses: #853023.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 31 Jan 2017 12:34:55 +0100
+
+gcc-7 (7-20170129-1) experimental; urgency=medium
+
+  * GCC 7 snapshot build, taken from the trunk 20170129.
   * Fix removing the RUNPATH from the asan, tsan, ubsan, cilkrts, gfortran
     and gphobos runtime libraries.
   * Let the gnatgcc symlinks point to the versioned names. Addresses: #839209.
@@ -9,7 +15,7 @@ gcc-7 (7-20170126-1) experimental; urgency=medium
   * libgo version bumped to 11.
   * Package gccbrig and the libhsail-rt library.
 
- -- Matthias Klose <doko at debian.org>  Thu, 26 Jan 2017 18:51:44 +0100
+ -- Matthias Klose <doko at debian.org>  Sun, 29 Jan 2017 13:51:35 +0100
 
 gcc-7 (7-20170121-1) experimental; urgency=medium
 
diff --git a/debian/rules.conf b/debian/rules.conf
index 75ec3a3..e3b8ea7 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -230,11 +230,7 @@ else
 endif
 ifneq (,$(filter $(build_type), build-native cross-build-native))
   ifeq (,$(filter gccgo% gnat%, $(PKGSOURCE)))
-    ifeq ($(hppa64_archs),hppa)
-      BINUTILS_BUILD_DEP += , binutils-hppa64$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)]
-    else
-      BINUTILS_BUILD_DEP += , binutils-hppa64-linux-gnu$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)]
-    endif
+    BINUTILS_BUILD_DEP += , $(binutils_hppa64)$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)]
   endif
 endif
 ifeq (,$(BINUTILSV))
diff --git a/debian/rules.defs b/debian/rules.defs
index 13b9717..9619656 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1315,10 +1315,13 @@ else
   hppa64_no_snap := no
   hppa64_archs := hppa
   ifneq (,$(filter $(build_type), build-native cross-build-native))
-    ifeq (,$(filter $(distrelease),wheezy squeeze jessie lucid precise trusty utopic vivid wily))
+    ifneq (,$(filter $(distrelease),wheezy squeeze jessie lucid precise trusty utopic vivid wily))
+      binutils_hppa64 := binutils-hppa64
+    else
       ifneq ($(single_package),yes)
         hppa64_archs += amd64 i386 x32
       endif
+      binutils_hppa64 := binutils-hppa64-linux-gnu
     endif
     ifneq (,$(filter $(DEB_TARGET_ARCH),$(hppa64_archs)))
       with_hppa64 := yes
diff --git a/debian/rules2 b/debian/rules2
index 7ed74d7..ace4157 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1298,6 +1298,7 @@ $(configure_hppa64_stamp): $(build_stamp)
 		--enable-languages=c \
 		--prefix=/$(PF) \
 		--libexecdir=/$(hppa64libexecdir) \
+		--with-gcc-major-version-only \
 		--disable-shared \
 		--disable-nls \
 		--disable-threads \
@@ -2277,6 +2278,21 @@ endif
 	    $(d_hppa64)/$(PF)/share/man/man1/hppa64-linux-gnu-$$i$(pkg_ver).1.gz; \
 	done
 
+	: # remove '*.la' and '*.lai' files, not shipped in any package.
+	find $(d_hppa64) -name '*.la' -o -name '*.lai' | xargs -r rm -f
+
+	: # remove rpath settings from binaries and shared libs
+	for i in $$(chrpath -k $(d_hppa64)/$(PF)/bin/* $(d_hppa64)/$(PFL)/lib*/lib*.so.* \
+			$(d_hppa64)/$(gcc_lib_dir)/plugin/* \
+			$(if $(filter $(with_multiarch_lib),yes), \
+			  $(d_hppa64)/$(PF)/lib/$(DEB_TARGET_MULTIARCH)/lib*.so.*) \
+			2>/dev/null | awk -F: '/R(UN)?PATH=/ {print $$1}'); \
+	do \
+	  [ -h $$i ] && continue; \
+	  chrpath --delete $$i; \
+	  echo "removed RPATH/RUNPATH: $$i"; \
+	done
+
 	touch $(install_hppa64_stamp)
 
 $(install_neon_stamp): $(build_neon_stamp)

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