diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-05 12:39:34 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-01-05 12:39:34 +0000 |
| commit | bbbfb626c2279fea82a503b38e0487cb9ba4c4e1 (patch) | |
| tree | 67f8981aa4fb9cb4c094133a020e22c2112e4008 /debian/rules.d/binary-libstdcxx.mk | |
| parent | 21758520912c84fd026d17c0c0fcb409fbbb5ffd (diff) | |
| download | gcc-47-bbbfb626c2279fea82a503b38e0487cb9ba4c4e1.tar.gz | |
* Explicitly search multiarch and multilib system directories when
calling dh_shlibdeps.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6526 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.d/binary-libstdcxx.mk')
| -rw-r--r-- | debian/rules.d/binary-libstdcxx.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk index 69ec6cf..5553bad 100644 --- a/debian/rules.d/binary-libstdcxx.mk +++ b/debian/rules.d/binary-libstdcxx.mk @@ -199,7 +199,7 @@ define __do_libstdcxx $(cross_makeshlibs) dh_makeshlibs -p$(p_l) || echo FIXME: libstdc++ symbols $(call cross_mangle_shlibs,$(p_l)) DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \ - $(call shlibdirs_to_search,$(subst stdc++$(CXX_SONAME),gcc$(GCC_SONAME),$(p_l))) + $(call shlibdirs_to_search,$(subst stdc++$(CXX_SONAME),gcc$(GCC_SONAME),$(p_l)),$(2)) $(call cross_mangle_substvars,$(p_l)) $(cross_gencontrol) dh_gencontrol -p$(p_l) -- -v$(DEB_VERSION) $(common_substvars) @@ -241,7 +241,7 @@ define __do_libstdcxx_dbg ) DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_d) \ - $(call shlibdirs_to_search,$(subst $(pkg_ver),,$(subst stdc++$(CXX_SONAME),gcc$(GCC_SONAME),$(p_l)))) + $(call shlibdirs_to_search,$(subst $(pkg_ver),,$(subst stdc++$(CXX_SONAME),gcc$(GCC_SONAME),$(p_l))),$(2)) $(call cross_mangle_substvars,$(p_d)) debian/dh_doclink -p$(p_d) $(p_base) |