diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.conf | 14 | ||||
| -rw-r--r-- | debian/rules.defs | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index c03a93f..f8e836a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ gcc-4.7 (4.7.2-13) UNRELEASED; urgency=low -fuse-ld=ld.bfd as an alias. * For cross builds, don't use the multiarch location for the C++ headers. * For cross builds, fix multilib inter package dependencies. + * For cross builds, fix libc6 dependencies for non-default multilib packages. -- Matthias Klose <doko@debian.org> Wed, 28 Nov 2012 07:59:32 +0100 diff --git a/debian/rules.conf b/debian/rules.conf index 81d95d5..de5df3b 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -207,7 +207,7 @@ LIBCXX_BIARCH_DEV_DEP := LIBCXX_BIARCH_DBG_DEP := ifneq (,$(findstring yes,$(biarch64) $(biarch32) $(biarchn32) $(biarchx32)$(biarchhf)$(biarchsf))) LIBC_BIARCH_DEP := $${shlibs:Depends} - LIBC_BIARCH_DEV_DEP := $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) (>= $(libc_ver)) + LIBC_BIARCH_DEV_DEP := $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS_biarch) (>= $(libc_ver)) ifeq ($(biarch64),yes) LIBCXX_BIARCH_DEV_DEP := lib64stdc++$(CXX_SONAME)-$(BASE_VERSION)-dev$(LS) (>= $${gcc:Version}) LIBCXX_BIARCH_DBG_DEP := lib64stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) @@ -245,16 +245,16 @@ ifneq (,$(findstring yes,$(biarch64) $(biarch32) $(biarchn32) $(biarchx32)$(biar ifeq ($(biarchhf),yes) LIBCXX_BIARCH_DEV_DEP := libhfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dev$(LS) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dev-armhf LIBCXX_BIARCH_DBG_DEP := libhfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dbg-armhf - LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(LS) (>= $(libc_ver)) - LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS) - LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) + LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(LS_biarch) (>= $(libc_ver)) + LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS_biarch) + LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS_biarch) endif ifeq ($(biarchsf),yes) LIBCXX_BIARCH_DEV_DEP := libsfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dev$(LS) (>= $${gcc:Version}) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dev-armel LIBCXX_BIARCH_DBG_DEP := libsfstdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg$(LS) | libstdc++$(CXX_SONAME)-$(BASE_VERSION)$(LS)-dbg-armel - LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(LS) (>= $(libc_ver)) - LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS) - LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS) + LIBC_BIARCH_DEP := $(LIBC_DEP)-$(biarch_deb_arch)$(LS_biarch) (>= $(libc_ver)) + LIBC_BIARCH_DEP += | $(LIBC_DEP)-$(biarch_deb_arch)$(LS_biarch) + LIBC_BIARCH_DEV_DEP += | $(LIBC_DEV_DEP)-$(biarch_deb_arch)$(LS_biarch) endif endif diff --git a/debian/rules.defs b/debian/rules.defs index c81d22b..3fa05db 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -146,6 +146,7 @@ ifeq ($(DEB_CROSS),yes) TP := $(subst _,-,$(DEB_TARGET_GNU_TYPE))- TS := -$(subst _,-,$(DEB_TARGET_ALIAS)) LS := -$(subst _,-,$(DEB_TARGET_ARCH))-cross + LS_biarch := -cross cross_bin_arch := -$(subst _,-,$(DEB_TARGET_ALIAS)) cross_lib_arch := -$(subst _,-,$(DEB_TARGET_ARCH))-cross |