cross-toolchain-base-devs team mailing list archive

[YunQiang Su <wzssyqa@xxxxxxxxx>]

Package: cross-toolchain-base-ports
Version: 15

crosslibn32 should be lib32 instead of libn32,
this will cause the `sed libc.so' for n32 to libn32.

and r6 use the ld.so name as ld-linux-mipsn8.so.1.

-- 
YunQiang Su

diff --git a/debian/Debian/DpkgCross.pm b/debian/Debian/DpkgCross.pm
index 755b54d..85e5351 100644
--- a/debian/Debian/DpkgCross.pm
+++ b/debian/Debian/DpkgCross.pm
@@ -395,7 +395,7 @@ sub setup {
 	$crosslib64 ||= $crosslib . "64";
 	$crosslib32 ||= $crosslib . "32";
 	$crosslibhf ||= $crosslib . "hf";
-	$crosslibn32 ||= $crosslib . "n32";
+	$crosslibn32 ||= $crosslib . "32";
 	$crosslibo32 ||= $crosslib . "o32";
 	$crosslibsf ||= $crosslib . "sf";
 	$crosslibx32 ||= $crosslib . "x32";
diff --git a/debian/dpkg-cross b/debian/dpkg-cross
index 2d77fa6..63d8298 100755
--- a/debian/dpkg-cross
+++ b/debian/dpkg-cross
@@ -634,10 +634,13 @@ sub sub_build {
 			if ($multiarch) {
 				if ($multiarch =~ m/mips(isa)?64.*-linux.*-gnuabi64.*/){
 					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslib64/ld.so.1:g;
+					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslib64/ld-linux-mipsn8.so.1:g;
 				}elsif ($multiarch =~ m/^mips(isa)?64.*-linux.*-gnuabin32.*/){
 					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslibn32/ld.so.1:g;
+					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslibn32/ld-linux-mipsn8.so.1:g;
 				}elsif ($multiarch =~ m/^mips(isa32)?.*-linux.*-gnu.*/){
 					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld.so.1:$1$crosslib/ld.so.1:g;
+					s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8.so.1:$1$crosslib/ld-linux-mipsn8.so.1:g;
 				}
 				s:(^|[^-\w/])(/usr)?/lib/$multiarch:$1$crosslib/:g;
 				s:(^|[^-\w/])(/usr)?/lib32/$multiarch:$1$crosslib32/:g;
@@ -1036,6 +1039,7 @@ sub sub_build {
 		# skip /usr/$(multiarch)/lib/ld.so.1 for mips n32 and 64.
 		# their ld.so.1 should be in lib32 and lib64.
 		next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m/lib\/ld.so.1$/);
+		next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~ m/lib\/ld-linux-mipsn8.so.1$/);
 
 		# skip links to private modules and plugins that are not
 		# useful or packaged in the -cross package, basically anything