wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gcc-multilib: fix source _triplet for install

Browse source 
The results are not in x86_64-unknown-linux-gnu but x86_64-pc-linux-gnu
thus fix the source paths for copying 32 bit libraries, headers, and specs.
This commit is contained in:
Jürgen Buchmüller 2020-01-24 14:46:15 +01:00
parent 3c45c56d8a
commit 0dbdcb4e1d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
srcpkgs/gcc-multilib/template
View file

@ -69,6 +69,7 @@ do_build() {
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
local _pc_triplet=x86_64-pc-linux-gnu
# Install to a tempdir and then only copy relevant files. # Install to a tempdir and then only copy relevant files.
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
vmkdir usr/lib vmkdir usr/lib
@ -83,12 +84,12 @@ do_install() {
vmkdir usr/include/c++/${_majorver}/${_triplet} vmkdir usr/include/c++/${_majorver}/${_triplet}
vmkdir usr/lib/gcc/${_triplet}/${_majorver} vmkdir usr/lib/gcc/${_triplet}/${_majorver}
cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_triplet}/${version}/32 \ cp -a ${wrksrc}/${pkgname}-build/usr/lib/gcc/${_pc_triplet}/${version}/32 \
${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/ ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/
cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_triplet}/32 \ cp -a ${wrksrc}/${pkgname}-build/usr/include/c++/${version}/${_pc_triplet}/32 \
${DESTDIR}/usr/include/c++/${_majorver}/${_triplet} ${DESTDIR}/usr/include/c++/${_majorver}/${_triplet}
vinstall ${wrksrc}/host-${_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver} vinstall ${wrksrc}/host-${_pc_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
rm -f ${DESTDIR}/usr/lib64 rm -f ${DESTDIR}/usr/lib64
} }