From cea895205bce818f5ec02406bf01ee6bbb61781d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 14 May 2025 15:54:04 -0400 Subject: [PATCH] common/build-style/void-cross: handle multiple musl versions --- common/build-style/void-cross.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index a92727fbe3c..4608d5e9928 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -295,9 +295,14 @@ _void_cross_build_musl() { msg_normal "Patching musl for ${tgt}\n" + case "${ver}" in + 1.1.*) _musl_pkgname="musl1.1" ;; + *) _musl_pkgname="musl" ;; + esac + cd ${wrksrc}/musl-${ver} - if [ -d "${XBPS_SRCPKGDIR}/musl/patches" ]; then - for f in ${XBPS_SRCPKGDIR}/musl/patches/*.patch; do + if [ -d "${XBPS_SRCPKGDIR}/${_musl_pkgname}/patches" ]; then + for f in ${XBPS_SRCPKGDIR}/${_musl_pkgname}/patches/*.patch; do _void_cross_apply_patch "$f" done fi @@ -323,7 +328,7 @@ _void_cross_build_musl() { CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \ ${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 ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib