[gcc-7] 92/354: * Fix removing the RUNPATH from the asan, tsan, ubsan, cilkrts, gfortran and gphobos runtime libraries.

[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 754c91245508e657323bc952e5f53064b3f4b12a
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Jan 22 18:32:04 2017 +0000

      * Fix removing the RUNPATH from the asan, tsan, ubsan, cilkrts, gfortran
        and gphobos runtime libraries.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9247 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog | 11 +++++++++--
 debian/rules2    |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef9059..8b5f761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-gcc-7 (7-20170121-1) UNRELEASED; urgency=medium
+gcc-7 (7-20170121-2) UNRELEASED; urgency=medium
+
+  * Fix removing the RUNPATH from the asan, tsan, ubsan, cilkrts, gfortran
+    and gphobos runtime libraries.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 22 Jan 2017 19:29:00 +0100
+
+gcc-7 (7-20170121-1) experimental; urgency=medium
 
   * GCC 7 snapshot build, taken from the trunk 20170121.
   * Configure --with-gcc-major-version-only, drop the gcc-base-version,
@@ -6,7 +13,7 @@ gcc-7 (7-20170121-1) UNRELEASED; urgency=medium
   * Adjust the g++-multiarch-incdir patch for reverted upstream patch,
     causing bootstrap regression (PR 78880). Closes: #852104.
 
- -- Matthias Klose <doko at debian.org>  Sat, 21 Jan 2017 20:34:04 +0100
+ -- Matthias Klose <doko at debian.org>  Sat, 21 Jan 2017 21:57:22 +0100
 
 gcc-7 (7-20170118-1) experimental; urgency=medium
 
diff --git a/debian/rules2 b/debian/rules2
index 28fb1c1..92fbf9c 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2134,12 +2134,12 @@ endif
 			$(d)/$(gcc_lib_dir)/plugin/* \
 			$(if $(filter $(with_multiarch_lib),yes), \
 			  $(d)/$(PF)/lib/$(DEB_TARGET_MULTIARCH)/lib*.so.*) \
-			2>/dev/null | awk -F: '/RPATH=/ {print $$1}'); \
+			2>/dev/null | awk -F: '/R(UN)?PATH=/ {print $$1}'); \
 	do \
 	  case "$$i" in ecj1|*gij-*|*libjawt*|*libjvm*) continue; esac; \
 	  [ -h $$i ] && continue; \
 	  chrpath --delete $$i; \
-	  echo "removed RPATH: $$i"; \
+	  echo "removed RPATH/RUNPATH: $$i"; \
 	done
 
 	: # remove '*.la' and '*.lai' files, not shipped in any package.

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