[gcc-7] 230/354: * Don't provide libobjc_gc symlinks for the libobjc multilib packages.

[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 a21effca282047a2ee84e1974bbab27f37f31b50
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Jun 28 09:24:41 2017 +0000

      * Don't provide libobjc_gc symlinks for the libobjc multilib packages.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9543 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                 | 1 +
 debian/rules.d/binary-libobjc.mk | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 01db432..e686596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7.1.0-7ubuntu1) UNRELEASED; urgency=medium
   * libstdc++6: Add more Breaks to smoothen upgrades from jessie to stretch.
     Addresses: #863845, #863745.
   * Try again building gnat on armel. See issue #861734.
+  * Don't provide libobjc_gc symlinks for the libobjc multilib packages.
 
  -- Matthias Klose <doko at debian.org>  Tue, 27 Jun 2017 13:19:14 +0200
 
diff --git a/debian/rules.d/binary-libobjc.mk b/debian/rules.d/binary-libobjc.mk
index da8bffb..0926942 100644
--- a/debian/rules.d/binary-libobjc.mk
+++ b/debian/rules.d/binary-libobjc.mk
@@ -66,6 +66,7 @@ define __do_libobjc
 	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
+	rm -f debian/$(p_l).symbols
 	$(if $(2),
 	  ln -sf libobjc.symbols debian/$(p_l).symbols ,
 	  fgrep -v libobjc.symbols.gc debian/libobjc.symbols > debian/$(p_l).symbols
@@ -96,10 +97,11 @@ define __do_libobjc_dev
 
 	$(call install_gcc_lib,libobjc,$(OBJC_SONAME),$(2),$(p_l))
 	$(if $(filter yes,$(with_objc_gc)),
+	  $(if $(2),,
 		dh_link -p$(p_l) \
 		  /$(usr_lib$(2))/libobjc_gc.so.$(OBJC_SONAME) \
 		  /$(gcc_lib_dir$(2))/libobjc_gc.so
-	)
+	))
 
 	debian/dh_doclink -p$(p_l) $(p_lbase)
 	echo $(p_l) >> debian/$(lib_binaries)

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