jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

musl: remove repository config file and clean up.

Browse source 
- musl doesn't need kernel-libc-headers in order to be built
- no need to conflict with glibc, since it can't be built for *-musl
targets
- the repository config file will be created in xbps instead, but it
isn't even truly needed, since XBPS "knows" when it was built for musl
This commit is contained in:
Érico Rolim 2020-12-31 15:30:06 -03:00 committed by Érico Nogueira Rolim
parent 2a0e447a2e
commit d2cec3d58d
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/musl/template
View file

@ -2,19 +2,17 @@
pkgname=musl pkgname=musl
reverts="1.2.0_1" reverts="1.2.0_1"
version=1.1.24 version=1.1.24
revision=5 revision=6
archs="*-musl" archs="*-musl"
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--prefix=/usr --disable-gcc-wrapper" configure_args="--prefix=/usr --disable-gcc-wrapper"
makedepends="kernel-libc-headers"
short_desc="Musl C library" short_desc="Musl C library"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT" license="MIT"
homepage="http://www.musl-libc.org/" homepage="http://www.musl-libc.org/"
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
conflicts="glibc>=0"
nostrip_files="libc.so" nostrip_files="libc.so"
shlib_provides="libc.so" shlib_provides="libc.so"
@ -27,7 +25,7 @@ post_build() {
do_install() { do_install() {
# Move everything to /usr. # Move everything to /usr.
vmkdir usr/lib vmkdir usr/lib
ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/lib ln -s usr/lib ${DESTDIR}/lib
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install
rm ${DESTDIR}/lib rm ${DESTDIR}/lib
# provide ldd # provide ldd
@ -41,9 +39,7 @@ do_install() {
vman ${FILESDIR}/getconf.1 vman ${FILESDIR}/getconf.1
# Fake ldconfig # Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig ln -s true ${DESTDIR}/usr/bin/ldconfig
# Create xbps.d(5) arch override file
vmkdir usr/share/xbps.d
echo "architecture=${XBPS_TARGET_MACHINE}" > ${DESTDIR}/usr/share/xbps.d/musl-arch.conf
vlicense COPYRIGHT vlicense COPYRIGHT
} }
@ -52,7 +48,7 @@ musl-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/*.a vmove "usr/lib/*.a"
vmove usr/lib/*.o vmove "usr/lib/*.o"
} }
} }