[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#883988: gcc-5-cross-ports: fix ftbfs due to mips64 ld.so.1 move



Package: src:gcc-5-cross-ports
Version: 14

recently, we patched dpkg-cross to don't ship ld.so.1 for mips64 and mipsn32
in /usr/<triplet>/lib, and keep them in
    /usr/<triplet>/lib{32,64}

This is due to libc6-mipsel-mips64el-cross ships its ld.so.1 also to
    /usr/<triplet>/lib
which will trigger file conflicts when install packages.

This scheme is following the old-years mips multilib.

So, for gcc cross building, we need to add /usr/<triplet>/lib{32,64} to the
search dir for dh_shlibdeps.

-- 
YunQiang Su
--- gcc/debian/rules.defs	2017-11-19 22:15:53.000000000 +0000
+++ gcc/debian/rules.defs	2017-12-09 17:10:18.477424936 +0000
@@ -2059,6 +2059,10 @@
 	$(with_build_sysroot)/usr/lib/$(call mlib_to_march,$(2)) \
 	$(with_build_sysroot)$(subst /usr,,/$(usr_lib$(2))) \
 	$(with_build_sysroot)/$(usr_lib$(2)) \
+	$(if $(findstring mips64,$(DEB_TARGET_ARCH)), \
+	  $(with_build_sysroot)/$(usr_lib64)) \
+	$(if $(findstring mipsn32,$(DEB_TARGET_ARCH)), \
+	  $(with_build_sysroot)/$(usr_libn32)) \
 	$(if $(filter yes,$(biarchsf) $(biarchhf)), \
 	  $(with_build_sysroot)/usr/$(call mlib_to_march,$(2))/lib) \
 	$(if $(filter yes, $(with_common_libs)),, \

Reply to: