[gcc-6] 157/401: * gdc: Fix linking the runtime library. Addresses: #826645.

[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 5e1c6d9f5b60a8bd761dbd4860c8d6c26421231c
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jun 7 19:47:53 2016 +0000

      * gdc: Fix linking the runtime library. Addresses: #826645.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8879 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog           | 8 +++++++-
 debian/rules.d/binary-d.mk | 9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0120738..3124fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-gcc-6 (6.1.1-5) UNRELEASED; urgency=medium
+gcc-6 (6.1.1-6) unstable; urgency=medium
+
+  * gdc: Fix linking the runtime library. Addresses: #826645.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 07 Jun 2016 19:55:01 +0200
+
+gcc-6 (6.1.1-5) unstable; urgency=medium
 
   * Update to SVN 20160603 (r237075, 6.1.1) from the gcc-6-branch.
     - Fix PR libstdc++/70762, PR libstdc++/69703, PR libstdc++/69703,
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index 4a97f1f..5c2b0f7 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -161,9 +161,10 @@ $(binary_stamp)-libphobos: $(install_stamp)
 	rm -rf $(d_libphobos)
 	dh_installdirs -p$(p_libphobos) $(dirs_libphobos)
 
-	mv $(d)/$(usr_lib)/libgphobos2.a \
+	mv $(d)/$(usr_lib)/libg{druntime,phobos2}.a \
 		$(d)/$(gcc_lib_dir)/.
-	$(dh_compat2) dh_movefiles -p$(p_libphobos) $(files_libphobos)
+	$(dh_compat2) dh_movefiles -p$(p_libphobos) \
+		$(gcc_lib_dir)/libg{druntime,phobos2}.a
 
 	# included in gdc package
 	rm -f $(d_libphobos)/$(gdc_include_dir)/__entrypoint.di
@@ -190,10 +191,10 @@ define __do_libphobos_dev
 	rm -rf $(d_l)
 	dh_installdirs -p$(p_l) \
 		$(gcc_lib_dir$(2))
-	mv $(d)/$(usr_lib$(2))/libgphobos2.a \
+	mv $(d)/$(usr_lib$(2))/libg{druntime,phobos2}.a \
 		$(d)/$(gcc_lib_dir$(2))/.
 	$(dh_compat2) dh_movefiles -p$(p_l) \
-		$(gcc_lib_dir$(2))/libgphobos2.a
+		$(gcc_lib_dir$(2))/libg{druntime,phobos2}.a
 	$(if $(2),,
 	$(dh_compat2) dh_movefiles -p$(p_l) \
 		$(gdc_include_dir)

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