From 364cd89e950d3a197745a74312695e07f7368855 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Dec 2020 23:42:14 +0100
Subject: [PATCH] cross-mips*-linux-musl*: clean up libdir handling

---
 srcpkgs/cross-mips-linux-musl/template     | 4 ++++
 srcpkgs/cross-mips-linux-muslhf/template   | 4 ++++
 srcpkgs/cross-mipsel-linux-musl/template   | 4 ++++
 srcpkgs/cross-mipsel-linux-muslhf/template | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index da251874668..19f600c9e5a 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -215,6 +215,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib32
+	ln -sf usr/lib ${_sysroot}/lib32
 
 	_binutils_build
 	_gcc_bootstrap
@@ -233,6 +235,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
 
 	# install linux API headers
 	cd ${wrksrc}/linux-${_linux_version}
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index b5d6ec947e9..7992864a8b6 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -215,6 +215,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib32
+	ln -sf usr/lib ${_sysroot}/lib32
 
 	_binutils_build
 	_gcc_bootstrap
@@ -233,6 +235,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
 
 	# install linux API headers
 	cd ${wrksrc}/linux-${_linux_version}
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 121143b9601..0c8b519b3f9 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -215,6 +215,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib32
+	ln -sf usr/lib ${_sysroot}/lib32
 
 	_binutils_build
 	_gcc_bootstrap
@@ -233,6 +235,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
 
 	# install linux API headers
 	cd ${wrksrc}/linux-${_linux_version}
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 942a1359fa5..bf75b9ec8d5 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -215,6 +215,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib32
+	ln -sf usr/lib ${_sysroot}/lib32
 
 	_binutils_build
 	_gcc_bootstrap
@@ -233,6 +235,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
 
 	# install linux API headers
 	cd ${wrksrc}/linux-${_linux_version}