[PR PATCH] cross-i686 compiler: keep sysroot /lib symlink

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

There is a new pull request by zdtcd against master on the void-packages repository

https://github.com/zdtcd/void-packages cross-lib
https://github.com/void-linux/void-packages/pull/14401

cross-i686 compiler: keep sysroot /lib symlink
When packaging Firefox ESR 68.1.0, and cross compile i686 from x86_64,
I received this complains:
> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/libc.so.6 inside /usr/i686-pc-linux-gnu
> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/ld-linux.so.2 inside /usr/i686-pc-linux-gnu

I didn't run into this complain when packaging aarch64 from x86_64,
I have a different problem when packaging ppc64le from x86_64


A patch file from https://github.com/void-linux/void-packages/pull/14401.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cross-lib-14401.patch --]
[-- Type: text/x-diff, Size: 3154 bytes --]

From e42c9b63cafd31781a7876057cea285918b42388 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Wed, 11 Sep 2019 18:14:31 +0700
Subject: [PATCH 1/2] cross-i686-pc-linux-gnu-libc: keep sysroot /lib symlink

firefox-esr 68.1.0 complains:

> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/libc.so.6 inside /usr/i686-pc-linux-gnu
> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/ld-linux.so.2 inside /usr/i686-pc-linux-gnu
---
 srcpkgs/cross-i686-pc-linux-gnu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c5b0e414cae..31069653b4c 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.32
-revision=1
+revision=2
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -343,7 +343,7 @@ do_install() {
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_sysroot}/{sbin,lib,etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,etc,var}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/lib/gconv
 	rm -f ${DESTDIR}/${_sysroot}/libexec

From e76c5b2935216c2f18b5a5d3bf41051b57820302 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Wed, 11 Sep 2019 18:14:31 +0700
Subject: [PATCH 2/2] cross-i686-linux-musl-libc: keep sysroot /lib symlink

firefox-esr 68.1.0 complains:

> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/libc.so.6 inside /usr/i686-pc-linux-gnu
> 0:06.67 DEBUG: | /usr/lib/gcc/i686-pc-linux-gnu/9.2.0/../../../../i686-pc-linux-gnu/bin/ld: cannot find /lib/ld-linux.so.2 inside /usr/i686-pc-linux-gnu
---
 srcpkgs/cross-i686-linux-musl/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 25d8042180a..9be855eaa70 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,7 +12,7 @@ _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
 version=0.32
-revision=1
+revision=2
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -296,11 +296,10 @@ do_install() {
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share
-	rm -rf ${DESTDIR}/${_sysroot}/{etc,var}
+	rm -rf ${DESTDIR}/${_sysroot}/{sbin,etc,var}
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -f ${DESTDIR}/${_sysroot}/libexec
 	rm -f ${DESTDIR}/${_sysroot}/lib/*.py
-	rm -f ${DESTDIR}/${_sysroot}/{sbin,lib}
 }
 
 cross-i686-linux-musl-libc_package() {