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

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

Browse source
This commit is contained in:
q66 2020-12-24 00:02:57 +01:00
parent 6ad765aa48
commit 7629168114
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/cross-x86_64-linux-gnu/template
View file

@ -192,7 +192,7 @@ _glibc_build() {
[ ! -d glibc-build ] && mkdir glibc-build [ ! -d glibc-build ] && mkdir glibc-build
cd glibc-build cd glibc-build
echo "slibdir=/usr/lib" > configparms echo "slibdir=/usr/lib64" > 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
@ -203,7 +203,7 @@ _glibc_build() {
export CFLAGS="-O2 -pipe" export CFLAGS="-O2 -pipe"
_args="--prefix=/usr" _args="--prefix=/usr"
_args+=" --libdir=/usr/lib" _args+=" --libdir=/usr/lib64"
_args+=" --host=${_triplet}" _args+=" --host=${_triplet}"
_args+=" --with-headers=${_sysroot}/usr/include" _args+=" --with-headers=${_sysroot}/usr/include"
_args+=" --config-cache" _args+=" --config-cache"
@ -290,6 +290,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/lib64
ln -sf usr/lib ${_sysroot}/lib64
_binutils_build _binutils_build
_gcc_bootstrap _gcc_bootstrap
@ -309,10 +311,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/lib64 ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib64
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64 ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64
ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib
# install linux API headers for x86 # install linux API headers for x86
cd ${wrksrc}/linux-${_linux_version} cd ${wrksrc}/linux-${_linux_version}