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

common/build-style/void-cross: handle multiple musl versions

Browse source
This commit is contained in:
classabbyamp 2025-05-14 15:54:04 -04:00
parent df219dc2f6
commit cea895205b
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/build-style/void-cross.sh
View file

@ -295,9 +295,14 @@ _void_cross_build_musl() {
msg_normal "Patching musl for ${tgt}\n" msg_normal "Patching musl for ${tgt}\n"
case "${ver}" in
1.1.*) _musl_pkgname="musl1.1" ;;
*) _musl_pkgname="musl" ;;
esac
cd ${wrksrc}/musl-${ver} cd ${wrksrc}/musl-${ver}
if [ -d "${XBPS_SRCPKGDIR}/musl/patches" ]; then if [ -d "${XBPS_SRCPKGDIR}/${_musl_pkgname}/patches" ]; then
for f in ${XBPS_SRCPKGDIR}/musl/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/${_musl_pkgname}/patches/*.patch; do
_void_cross_apply_patch "$f" _void_cross_apply_patch "$f"
done done
fi fi
@ -323,7 +328,7 @@ _void_cross_build_musl() {
CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
${tgt}-gcc -pipe -fPIC ${cross_musl_cflags} ${cross_musl_ldflags} -fpie \ ${tgt}-gcc -pipe -fPIC ${cross_musl_cflags} ${cross_musl_ldflags} -fpie \
-c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c \ -c ${XBPS_SRCPKGDIR}/${_musl_pkgname}/files/__stack_chk_fail_local.c \
-o __stack_chk_fail_local.o -o __stack_chk_fail_local.o
${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib