snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

build-style/void-cross: fix for newer libucontext + autoguess arch

Browse source
This commit is contained in:
q66 2021-01-17 16:04:01 +01:00
parent 599b7fef67
commit dd50c1905d
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -312,14 +312,33 @@ _void_cross_build_libucontext() {
[ -f ${wrksrc}/.libucontext_build_done ] && return 0 [ -f ${wrksrc}/.libucontext_build_done ] && return 0
local ver=$1 local ver=$1
local arch incpath
msg_normal "Building libucontext for ${cross_triplet}\n" msg_normal "Building libucontext for ${cross_triplet}\n"
case "$cross_triplet" in
x86_64*) arch=x86_64 ;;
i686*) arch=x86 ;;
powerpc64*) arch=ppc64 ;;
powerpc*) arch=ppc ;;
mips*64*) arch=mips64 ;;
mips*) arch=mips ;;
aarch64*) arch=aarch64 ;;
arm*) arch=arm ;;
riscv64*) arch=riscv64 ;;
s390x*) arch=s390x ;;
*) msg_error "Unknown libucontext arch for ${cross_triplet}\n" ;;
esac
cd ${wrksrc}/libucontext-${ver} cd ${wrksrc}/libucontext-${ver}
# a terrible hack but seems to work for now # a terrible hack but seems to work for now
# we build a static-only library to prevent linking to a runtime
# since it's tiny it can be linked into libgo and we don't have
# to keep it around (which would possibly conflict with crossdeps)
incpath="${wrksrc}/build_root/usr/${cross_triplet}/usr/include"
CC="${cross_triplet}-gcc" AS="${cross_triplet}-as" AR="${cross_triplet}-ar" \ CC="${cross_triplet}-gcc" AS="${cross_triplet}-as" AR="${cross_triplet}-ar" \
CPPFLAGS="-pipe ${cross_musl_cflags} -g0 -Os -nostdinc -isystem ${wrksrc}/build_root/usr/${cross_triplet}/usr/include" \ make ARCH=$arch libucontext.a \
make ARCH=${cross_libucontext_arch} libucontext.a CFLAGS="${cross_musl_cflags} -g0 -nostdinc -isystem ${incpath}"
cp libucontext.a ${wrksrc}/build_root/usr/${cross_triplet}/usr/lib cp libucontext.a ${wrksrc}/build_root/usr/${cross_triplet}/usr/lib