[gcc-6] 354/401: * 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 pu/reproducible_builds
in repository gcc-6.

commit 91649078a0ce40c44f7be6a959ddf56053a139f5
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Jan 22 18:21:05 2017 +0000

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

diff --git a/debian/changelog b/debian/changelog
index ee64be8..1410670 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-6 (6.3.0-4ubuntu1) 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:19:47 +0100
+
 gcc-6 (6.3.0-4) unstable; urgency=medium
 
   * Update to SVN 20170121 (r244748) from the gcc-6-branch.
diff --git a/debian/rules2 b/debian/rules2
index 47867bb..2bb1c40 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2318,12 +2318,12 @@ endif
 			$(if $(filter $(with_multiarch_lib),yes), \
 			  $(d)/$(PF)/lib/$(DEB_TARGET_MULTIARCH)/lib*.so.*) \
 			$(d)/$(PF)/lib*/gcj$(pkg_ver)*/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-6.git