From 0dbdcb4e1dbfa8490b03ce812a1a9da3da1cf035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 24 Jan 2020 14:46:15 +0100 Subject: [PATCH] gcc-multilib: fix source _triplet for install 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. --- srcpkgs/gcc-multilib/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template index 29e3b4be974..935714301d6 100644 --- a/srcpkgs/gcc-multilib/template +++ b/srcpkgs/gcc-multilib/template @@ -69,6 +69,7 @@ do_build() { make ${makejobs} } do_install() { + local _pc_triplet=x86_64-pc-linux-gnu # Install to a tempdir and then only copy relevant files. if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then vmkdir usr/lib @@ -83,12 +84,12 @@ do_install() { vmkdir usr/include/c++/${_majorver}/${_triplet} 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}/ - 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} - 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 }