Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cross-i686 compiler: keep sysroot /lib symlink #14401

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions srcpkgs/cross-i686-linux-musl/template
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/cross-i686-pc-linux-gnu/template
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down Expand Up @@ -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
Expand Down