[gcc-6] 128/401: * Call dh_makeshlibs with the --noscripts option when building a cross compiler.

Ximin Luo infinity0 at debian.org
Wed Apr 5 15:48:21 UTC 2017


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 d188a04fea6eb239b1a77849e41f0a9542ff0b2c
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Apr 30 14:40:22 2016 +0000

      * Call dh_makeshlibs with the --noscripts option when building a
        cross compiler.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8815 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                     |  7 +++++++
 debian/rules.d/binary-ada.mk         |  6 +++---
 debian/rules.d/binary-fortran.mk     |  2 +-
 debian/rules.d/binary-go.mk          |  2 +-
 debian/rules.d/binary-java.mk        |  8 ++++----
 debian/rules.d/binary-libasan.mk     |  2 +-
 debian/rules.d/binary-libatomic.mk   |  2 +-
 debian/rules.d/binary-libcilkrts.mk  |  2 +-
 debian/rules.d/binary-libgcc.mk      |  2 +-
 debian/rules.d/binary-libgomp.mk     |  2 +-
 debian/rules.d/binary-libitm.mk      |  2 +-
 debian/rules.d/binary-liblsan.mk     |  2 +-
 debian/rules.d/binary-libmpx.mk      |  2 +-
 debian/rules.d/binary-libobjc.mk     |  2 +-
 debian/rules.d/binary-libquadmath.mk |  2 +-
 debian/rules.d/binary-libssp.mk      | 10 +++++-----
 debian/rules.d/binary-libstdcxx.mk   |  4 ++--
 debian/rules.d/binary-libtsan.mk     |  2 +-
 debian/rules.d/binary-libubsan.mk    |  2 +-
 debian/rules.d/binary-libvtv.mk      |  2 +-
 debian/rules.d/binary-nof.mk         |  2 +-
 debian/rules.defs                    |  4 ++++
 22 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a15e5ec..91b5e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
+
+  * Call dh_makeshlibs with the --noscripts option when building a
+    cross compiler.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 30 Apr 2016 16:38:17 +0200
+
 gcc-6 (6.1.1-1) unstable; urgency=medium
 
   * GCC 6.1.0 release.
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 2e672ae..d4effb6 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -117,7 +117,7 @@ $(binary_stamp)-libgnat: $(install_stamp)
 	    fi; \
 	  done; \
 	done
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_lgnat) -V '$(p_lgnat) (>= $(DEB_VERSION))'
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnat) -V '$(p_lgnat) (>= $(DEB_VERSION))'
 	$(call cross_mangle_shlibs,$(p_lgnat))
 
 ifneq (,$(filter $(build_type), build-native cross-build-native))
@@ -171,7 +171,7 @@ endif
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn) $(usr_lib)/libgnatvsn.so.$(GNAT_VERSION)
 	debian/dh_doclink -p$(p_lgnatvsn) $(p_glbase)
 	dh_strip -p$(p_lgnatvsn) --dbg-package=$(p_lgnatvsn_dbg)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_lgnatvsn) \
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnatvsn) \
 		-V '$(p_lgnatvsn) (>= $(DEB_VERSION))'
 	$(call cross_mangle_shlibs,$(p_lgnatvsn))
 	cat debian/$(p_lgnatvsn)/DEBIAN/shlibs >> debian/shlibs.local
@@ -218,7 +218,7 @@ endif
 	$(dh_compat2) dh_movefiles -p$(p_lgnatprj) $(usr_lib)/libgnatprj.so.$(GNAT_VERSION)
 	debian/dh_doclink -p$(p_lgnatprj) $(p_glbase)
 	dh_strip -p$(p_lgnatprj) --dbg-package=$(p_lgnatprj_dbg)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_lgnatprj) \
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnatprj) \
 		-V '$(p_lgnatprj) (>= $(DEB_VERSION))'
 	$(call cross_mangle_shlibs,$(p_lgnatprj))
 	cat debian/$(p_lgnatprj)/DEBIAN/shlibs >> debian/shlibs.local
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index cdf5aa7..1e6fce4 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -99,7 +99,7 @@ define __do_fortran
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libgfortran.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index 7f8be66..2e60437 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -121,7 +121,7 @@ define __do_gccgo
 
 	: # don't strip: https://gcc.gnu.org/ml/gcc-patches/2015-02/msg01722.html
 	: # dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index e6fb294..b223b77 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -516,17 +516,17 @@ endif
 
 	mkdir -p $(d_jrehl)/var/lib/gcj$(pkg_ver)
 
-	dh_makeshlibs -p$(p_jlib) -V '$(p_jlib) (>= $(DEB_GCJ_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_jlib) -V '$(p_jlib) (>= $(DEB_GCJ_SOVERSION))'
 	echo "libgcj_bc 1 libgcj-bc (>= 4.2.2-1)" >> debian/$(p_jlib)/DEBIAN/shlibs
 	cat debian/$(p_jlib)/DEBIAN/shlibs >> debian/shlibs.local
 
-	dh_makeshlibs -p$(p_jlibx) -V '$(p_jlibx) (>= $(DEB_GCJ_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_jlibx) -V '$(p_jlibx) (>= $(DEB_GCJ_SOVERSION))'
 
 #ifneq (,$(findstring gtk, $(java_awt_peers)))
-#	dh_makeshlibs -p$(p_jgtk) -V '$(p_jgtk) (>= $(DEB_GCJ_SOVERSION))'
+#	dh_makeshlibs $(ldconfig_arg) -p$(p_jgtk) -V '$(p_jgtk) (>= $(DEB_GCJ_SOVERSION))'
 #endif
 #ifneq (,$(findstring qt, $(java_awt_peers)))
-#	dh_makeshlibs -p$(p_jqt) -V '$(p_jqt) (>= $(DEB_GCJ_SOVERSION))'
+#	dh_makeshlibs $(ldconfig_arg) -p$(p_jqt) -V '$(p_jqt) (>= $(DEB_GCJ_SOVERSION))'
 #endif
 
 	dh_strip -X/bin/ --dbg-package=$(p_jdbg) \
diff --git a/debian/rules.d/binary-libasan.mk b/debian/rules.d/binary-libasan.mk
index e6fa756..2370e82 100644
--- a/debian/rules.d/binary-libasan.mk
+++ b/debian/rules.d/binary-libasan.mk
@@ -36,7 +36,7 @@ define __do_asan
 	fi
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-libatomic.mk b/debian/rules.d/binary-libatomic.mk
index 1b07315..fe038e8 100644
--- a/debian/rules.d/binary-libatomic.mk
+++ b/debian/rules.d/binary-libatomic.mk
@@ -32,7 +32,7 @@ define __do_atomic
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libatomic.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search,,$(2))
diff --git a/debian/rules.d/binary-libcilkrts.mk b/debian/rules.d/binary-libcilkrts.mk
index acdbdab..806acbf 100644
--- a/debian/rules.d/binary-libcilkrts.mk
+++ b/debian/rules.d/binary-libcilkrts.mk
@@ -37,7 +37,7 @@ define __do_cilkrts
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libcilkrts.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index 7549021..ce9a2bd 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -298,7 +298,7 @@ define __do_libgcc
 		$(if $(findstring gcc1,$(p_l)), \
 		ln -sf libgcc.symbols debian/$(p_l).symbols \
 		)
-		$(cross_makeshlibs) dh_makeshlibs -p$(p_l) -p$(p_d) \
+		$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) -p$(p_d) \
 			-- -v$(DEB_LIBGCC_VERSION)
 		$(call cross_mangle_shlibs,$(p_l))
 		$(if $(filter arm-linux-gnueabi%,$(DEB_TARGET_GNU_TYPE)),
diff --git a/debian/rules.d/binary-libgomp.mk b/debian/rules.d/binary-libgomp.mk
index f80ca89..5e2f4b3 100644
--- a/debian/rules.d/binary-libgomp.mk
+++ b/debian/rules.d/binary-libgomp.mk
@@ -32,7 +32,7 @@ define __do_gomp
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libgomp.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search,$(subst gomp$(GOMP_SONAME),gcc$(GCC_SONAME),$(p_l)),$(2))
diff --git a/debian/rules.d/binary-libitm.mk b/debian/rules.d/binary-libitm.mk
index aa83e06..cc69cc6 100644
--- a/debian/rules.d/binary-libitm.mk
+++ b/debian/rules.d/binary-libitm.mk
@@ -32,7 +32,7 @@ define __do_itm
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libitm.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search,,$(2))
diff --git a/debian/rules.d/binary-liblsan.mk b/debian/rules.d/binary-liblsan.mk
index 180aba2..ce710dd 100644
--- a/debian/rules.d/binary-liblsan.mk
+++ b/debian/rules.d/binary-liblsan.mk
@@ -36,7 +36,7 @@ define __do_lsan
 	fi
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-libmpx.mk b/debian/rules.d/binary-libmpx.mk
index 636579f..ddb7ddf 100644
--- a/debian/rules.d/binary-libmpx.mk
+++ b/debian/rules.d/binary-libmpx.mk
@@ -39,7 +39,7 @@ define __do_mpx
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libmpx.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l)
 	$(call cross_mangle_substvars,$(p_l))
diff --git a/debian/rules.d/binary-libobjc.mk b/debian/rules.d/binary-libobjc.mk
index b8c139f..6c5db4f 100644
--- a/debian/rules.d/binary-libobjc.mk
+++ b/debian/rules.d/binary-libobjc.mk
@@ -66,7 +66,7 @@ define __do_libobjc
 	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l) -Xlibobjc_gc.so
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) -Xlibobjc_gc.so
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search,$(subst objc$(OBJC_SONAME),gcc$(GCC_SONAME),$(p_l)),$(2))
diff --git a/debian/rules.d/binary-libquadmath.mk b/debian/rules.d/binary-libquadmath.mk
index fb7ed39..93c4292 100644
--- a/debian/rules.d/binary-libquadmath.mk
+++ b/debian/rules.d/binary-libquadmath.mk
@@ -32,7 +32,7 @@ define __do_qmath
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	ln -sf libquadmath.symbols debian/$(p_l).symbols
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search,,$(2))
diff --git a/debian/rules.d/binary-libssp.mk b/debian/rules.d/binary-libssp.mk
index 5ec169f..e2c873a 100644
--- a/debian/rules.d/binary-libssp.mk
+++ b/debian/rules.d/binary-libssp.mk
@@ -64,7 +64,7 @@ $(binary_stamp)-libssp: $(install_stamp)
 	debian/dh_rmemptydirs -p$(p_ssp)
 
 	dh_strip -p$(p_ssp)
-	dh_makeshlibs -p$(p_ssp) -V '$(p_ssp) (>= $(DEB_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_ssp) -V '$(p_ssp) (>= $(DEB_SOVERSION))'
 	dh_shlibdeps -p$(p_ssp)
 	echo $(p_ssp) >> debian/arch_binaries
 
@@ -85,7 +85,7 @@ $(binary_stamp)-lib64ssp: $(install_stamp)
 	debian/dh_doclink -p$(p_ssp64) $(p_lbase)
 
 	dh_strip -p$(p_ssp64)
-	dh_makeshlibs -p$(p_ssp64) -V '$(p_ssp64) (>= $(DEB_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_ssp64) -V '$(p_ssp64) (>= $(DEB_SOVERSION))'
 #	dh_shlibdeps -p$(p_ssp64)
 	echo $(p_ssp64) >> debian/arch_binaries
 
@@ -106,7 +106,7 @@ $(binary_stamp)-lib32ssp: $(install_stamp)
 	debian/dh_doclink -p$(p_ssp32) $(p_lbase)
 
 	dh_strip -p$(p_ssp32)
-	dh_makeshlibs -p$(p_ssp32) -V '$(p_ssp32) (>= $(DEB_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_ssp32) -V '$(p_ssp32) (>= $(DEB_SOVERSION))'
 #	dh_shlibdeps -p$(p_ssp32)
 	echo $(p_ssp32) >> debian/arch_binaries
 
@@ -127,7 +127,7 @@ $(binary_stamp)-libn32ssp: $(install_stamp)
 	debian/dh_doclink -p$(p_sspn32) $(p_lbase)
 
 	dh_strip -p$(p_sspn32)
-	dh_makeshlibs -p$(p_sspn32) -V '$(p_sspn32) (>= $(DEB_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_sspn32) -V '$(p_sspn32) (>= $(DEB_SOVERSION))'
 #	dh_shlibdeps -p$(p_sspn32)
 	echo $(p_sspn32) >> debian/arch_binaries
 
@@ -148,7 +148,7 @@ $(binary_stamp)-libx32ssp: $(install_stamp)
 	debian/dh_doclink -p$(p_sspx32) $(p_lbase)
 
 	dh_strip -p$(p_sspx32)
-	dh_makeshlibs -p$(p_sspx32) -V '$(p_sspx32) (>= $(DEB_SOVERSION))'
+	dh_makeshlibs $(ldconfig_arg) -p$(p_sspx32) -V '$(p_sspx32) (>= $(DEB_SOVERSION))'
 #	dh_shlibdeps -p$(p_sspx32)
 	echo $(p_sspx32) >> debian/arch_binaries
 
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index 3baa3a7..98257c6 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -210,9 +210,9 @@ define __do_libstdcxx
 	dh_strip -p$(p_l) $(if $(filter rtlibs,$(DEB_STAGE)),,--dbg-package=$(1)-$(BASE_VERSION)-dbg$(cross_lib_arch))
 
 	$(if $(filter $(DEB_TARGET_ARCH), armel hppa sparc64), \
-	  -$(cross_makeshlibs) dh_makeshlibs -p$(p_l) \
+	  -$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) \
 	  @echo "FIXME: libstdc++ not feature complete (https://gcc.gnu.org/ml/gcc/2014-07/msg00000.html)", \
-	  $(cross_makeshlibs) dh_makeshlibs -p$(p_l) \
+	  $(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l) \
 	)
 
 	$(call cross_mangle_shlibs,$(p_l))
diff --git a/debian/rules.d/binary-libtsan.mk b/debian/rules.d/binary-libtsan.mk
index d39d5a7..03706e7 100644
--- a/debian/rules.d/binary-libtsan.mk
+++ b/debian/rules.d/binary-libtsan.mk
@@ -38,7 +38,7 @@ define __do_tsan
 	fi
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-libubsan.mk b/debian/rules.d/binary-libubsan.mk
index b7f658a..5c0f03d 100644
--- a/debian/rules.d/binary-libubsan.mk
+++ b/debian/rules.d/binary-libubsan.mk
@@ -36,7 +36,7 @@ define __do_ubsan
 	fi
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-libvtv.mk b/debian/rules.d/binary-libvtv.mk
index 0dec44c..2d3dca2 100644
--- a/debian/rules.d/binary-libvtv.mk
+++ b/debian/rules.d/binary-libvtv.mk
@@ -36,7 +36,7 @@ define __do_vtv
 	fi
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
-	$(cross_makeshlibs) dh_makeshlibs -p$(p_l)
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
 		$(call shlibdirs_to_search, \
diff --git a/debian/rules.d/binary-nof.mk b/debian/rules.d/binary-nof.mk
index f49bc58..fa5408a 100644
--- a/debian/rules.d/binary-nof.mk
+++ b/debian/rules.d/binary-nof.mk
@@ -40,7 +40,7 @@ $(binary_stamp)-nof: $(install_stamp)
 	dh_strip -p$(p_nof)
 	dh_shlibdeps -p$(p_nof)
 
-	dh_makeshlibs -p$(p_nof)
+	dh_makeshlibs $(ldconfig_arg) -p$(p_nof)
 	: # Only keep the shlibs file for the libgcc_s_nof library
 	fgrep libgcc_s_nof debian/$(p_nof)/DEBIAN/shlibs \
 		> debian/$(p_nof)/DEBIAN/shlibs.tmp
diff --git a/debian/rules.defs b/debian/rules.defs
index 1de5cda..b4567dc 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1476,6 +1476,10 @@ ifneq (,$(wildcard /usr/bin/localedef))
   locale_data = generate
 endif
 
+ifneq (,$(filter $(build_type), build-cross cross-build-cross))
+  ldconfig_arg = --noscripts
+endif
+
 all_enabled_languages := $(enabled_languages)
 languages_without_lang_opt := c++ objc obj-c++
 

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



More information about the Reproducible-commits mailing list