[gcc-6] 286/401: * Build the GC enabled libobjc using the system libgc when available

[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 6b7e1f7cdbcbc9b824d2511422546cdef6cadeaf
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Nov 19 14:48:19 2016 +0000

      * Build the GC enabled libobjc using the system libgc when available
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9100 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/libobjc.symbols                |  3 ---
 debian/libobjc.symbols.gc             |  3 +++
 debian/patches/libobjc-system-gc.diff | 27 ++++++++++++++++++++++++++-
 debian/rules.d/binary-libobjc.mk      |  5 ++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/debian/libobjc.symbols b/debian/libobjc.symbols
index e8537b2..a37ccd4 100644
--- a/debian/libobjc.symbols
+++ b/debian/libobjc.symbols
@@ -6,7 +6,4 @@ libobjc_gc.so.4 #PACKAGE# #MINVER#
 #include "libobjc.symbols.common"
 #include "libobjc.symbols.gc"
  __gnu_objc_personality_v0 at Base 4.2.1
- async_set_pht_entry_from_index at Base 4.2.1
- free_list_index_of at Base 4.2.1
- suspend_self at Base 4.2.1
  (arch=armel armhf)__objc_exception_class at Base 4.3.0
diff --git a/debian/libobjc.symbols.gc b/debian/libobjc.symbols.gc
index d5f8447..87681af 100644
--- a/debian/libobjc.symbols.gc
+++ b/debian/libobjc.symbols.gc
@@ -1,3 +1,6 @@
+ async_set_pht_entry_from_index at Base 4.2.1
+ free_list_index_of at Base 4.2.1
+ suspend_self at Base 4.2.1
  GC_abort at Base 6
  GC_acquire_mark_lock at Base 6
  GC_add_ext_descriptor at Base 6
diff --git a/debian/patches/libobjc-system-gc.diff b/debian/patches/libobjc-system-gc.diff
index dc4687f..e12558a 100644
--- a/debian/patches/libobjc-system-gc.diff
+++ b/debian/patches/libobjc-system-gc.diff
@@ -1,5 +1,30 @@
 # DP: Build the GC enabled libobjc using the system libgc when available
 
+<toplevel>
+
+2016-11-19  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: Include pkg.m4, check for bdw-gc pkg-config module.
+	* configure: Regenerate.
+
+config/
+
+2016-11-19  Matthias Klose  <doko at ubuntu.com>
+
+	* pkg.m4: New file.
+
+libobjc/
+
+2016-11-19  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac (--enable-objc-gc): Allow to configure with a
+	system provided boehm-gc.
+	* configure: Regenerate.
+	* Makefile.in (OBJC_BOEHM_GC_LIBS): Get value from configure.
+	* gc.c: Optionally include system boehm-gc headers.
+	* memory.c: Likewise
+	* objects.c: Likewise
+
 --- a/src/config/pkg.m4
 +++ b/src/config/pkg.m4
 @@ -0,0 +1,550 @@
@@ -700,7 +725,7 @@
 +    OBJC_GCFLAGS='-DOBJC_WITH_GC=1'
 +    OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la'
 +    OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include'
-+    OBJC_BOEHM_GC_LIBS=
++    OBJC_BOEHM_GC_LIBS='../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)'
 +    ;;
 +  system)
 +    OBJC_GCFLAGS='-DOBJC_WITH_GC=1 -DSYSTEM_BOEHM_GC=1'
diff --git a/debian/rules.d/binary-libobjc.mk b/debian/rules.d/binary-libobjc.mk
index df92ebe..da8bffb 100644
--- a/debian/rules.d/binary-libobjc.mk
+++ b/debian/rules.d/binary-libobjc.mk
@@ -66,7 +66,10 @@ define __do_libobjc
 	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	ln -sf libobjc.symbols 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
+	)
 	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) \
 		-- -a$(call mlib_to_arch,$(2)) || echo XXXXXXXXXXXXXX ERROR $(p_l)
 	rm -f debian/$(p_l).symbols

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