From 8076ab54d794f9edeb48f7792a976f1953d8f7a4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Dec 2020 23:46:40 +0100
Subject: [PATCH] cross-powerpc-linux-musl: clean up libdir handling and other
 stuff

---
 srcpkgs/cross-powerpc-linux-musl/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index d352f9df97b..12db040a59a 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -6,8 +6,6 @@ _linux_version=4.19
 _libucontext_version=0.9.0
 
 _triplet=powerpc-linux-musl
-_fpuflags=
-_archflags="-mcpu=powerpc -msecure-plt"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
@@ -74,7 +72,6 @@ _binutils_build() {
 	_args+=" --disable-shared"
 	_args+=" --with-system-zlib"
 	_args+=" --enable-secureplt"
-	_args+=" ${_fpuflags}"
 
 	../binutils-${_binutils_version}/configure ${_args}
 
@@ -120,8 +117,6 @@ _gcc_bootstrap() {
 	_args+=" --disable-symvers"
 	_args+=" libat_cv_have_ifunc=no"
 	_args+=" --enable-secureplt"
-	_args+=" --with-long-double=64"
-	_args+=" ${_fpuflags}"
 
 	CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \
 		../gcc-${_gcc_version}/configure ${_args}
@@ -163,7 +158,7 @@ _musl_build() {
 		done
 	fi
 
-	CC="${_triplet}-gcc" CFLAGS="-Os -pipe -fPIC ${_archflags}" \
+	CC="${_triplet}-gcc" CFLAGS="-Os -pipe -fPIC" \
 		./configure --prefix=/usr
 
 	make ${makejobs}
@@ -180,7 +175,7 @@ _libucontext_build() {
 
 	# it's ok if we're static only here
 	CC="${_triplet}-gcc" AR="${_triplet}-ar" AS="${_triplet}-as" \
-		CFLAGS="-Os -pipe ${_archflags}" \
+		CFLAGS="-Os -pipe" \
 		make ARCH=ppc libucontext.a
 
 	cp libucontext.a ${_sysroot}/usr/lib
@@ -220,8 +215,6 @@ _gcc_build() {
 	_args+=" libat_cv_have_ifunc=no"
 	_args+=" --disable-decimal-float"
 	_args+=" --enable-secureplt"
-	_args+=" --with-long-double=64"
-	_args+=" ${_fpuflags}"
 
 	../gcc-${_gcc_version}/configure ${_args}
 
@@ -244,6 +237,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
@@ -263,6 +258,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}