moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

cross-powerpc-linux-gnu: clean up libdir handling

Browse source
This commit is contained in:
q66 2020-12-23 23:45:36 +01:00
parent 364cd89e95
commit bc3dee1578
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/cross-powerpc-linux-gnu/template
View file

@ -5,7 +5,6 @@ _glibc_version=2.30
_linux_version=4.19 _linux_version=4.19
_triplet=powerpc-linux-gnu _triplet=powerpc-linux-gnu
_archflags="-mcpu=powerpc -msecure-plt"
_sysroot="/usr/${_triplet}" _sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
@ -190,15 +189,18 @@ _glibc_build() {
[ ! -d glibc-build ] && mkdir glibc-build [ ! -d glibc-build ] && mkdir glibc-build
cd glibc-build cd glibc-build
echo "slibdir=/usr/lib32" > configparms
echo "libc_cv_forced_unwind=yes" > config.cache echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache echo "libc_cv_c_cleanup=yes" >> config.cache
export CC="${_triplet}-gcc" CXX="${_triplet}-g++" LD="${_triplet}-ld" \ export CC="${_triplet}-gcc" CXX="${_triplet}-g++" LD="${_triplet}-ld" \
AS="${_triplet}-as" CPP="${_triplet}-cpp" \ AS="${_triplet}-as" CPP="${_triplet}-cpp" \
NM="${_triplet}-nm" NM="${_triplet}-nm"
export CFLAGS="-O1 -pipe ${_archflags}" export CFLAGS="-O1 -pipe"
_args="--prefix=/usr" _args="--prefix=/usr"
_args+=" --libdir=/usr/lib32"
_args+=" --host=${_triplet}" _args+=" --host=${_triplet}"
_args+=" --with-headers=${_sysroot}/usr/include" _args+=" --with-headers=${_sysroot}/usr/include"
_args+=" --config-cache" _args+=" --config-cache"
@ -233,9 +235,9 @@ _gcc_build() {
# Make this link to target libs. # Make this link to target libs.
if [ ! -f .sed_subst_done ]; then if [ ! -f .sed_subst_done ]; then
sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \
-i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so -i ${_sysroot}/lib/libc.so
sed -e "s, /lib64/, ${_sysroot}/lib64/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \ sed -e "s, /lib32/, ${_sysroot}/lib32/,g;s, /usr/lib32/, ${_sysroot}/usr/lib32/,g" \
-i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so -i ${_sysroot}/lib/libc.so
touch .sed_subst_done touch .sed_subst_done
fi fi
@ -289,6 +291,8 @@ do_build() {
ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f} ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
fi fi
done done
ln -sf lib ${_sysroot}/usr/lib32
ln -sf usr/lib ${_sysroot}/lib32
_binutils_build _binutils_build
_gcc_bootstrap _gcc_bootstrap
@ -299,7 +303,7 @@ do_build() {
} }
do_install() { do_install() {
for f in include libexec bin sbin; do for f in include lib libexec bin sbin; do
if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then if [ ! -d ${DESTDIR}/${_sysroot}/usr/${f} ]; then
mkdir -p ${DESTDIR}/${_sysroot}/usr/${f} mkdir -p ${DESTDIR}/${_sysroot}/usr/${f}
fi fi
@ -308,10 +312,8 @@ do_install() {
${DESTDIR}/${_sysroot}/${f} ${DESTDIR}/${_sysroot}/${f}
fi fi
done done
mkdir -p ${DESTDIR}/${_sysroot}/usr/lib ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib64 ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib
# install cross binutils # install cross binutils
cd ${wrksrc}/binutils-build cd ${wrksrc}/binutils-build