From 281e0dc4b0167e0704241179419d52685c9ab237 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 16 Aug 2020 10:47:44 +0200 Subject: [PATCH 1/3] cross-aarch64-linux-musl: do not remove gcc's stddef.h 224951e9dd7820f31ffce0fbe853e860bb37accc forgot to touch aarch64-musl, possibly because it was added around that time. --- srcpkgs/cross-aarch64-linux-musl/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 7766a9c929d..8dba1d564ec 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.33 -revision=2 +revision=3 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -284,8 +284,7 @@ do_install() { make DESTDIR=${DESTDIR}/${_sysroot} install # Remove useless headers. - rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed/ \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include/stddef.h + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/*/include-fixed # Make ld-musl.so symlinks relative. ln -sf libc.so ${DESTDIR}/${_sysroot}/usr/lib/ld-musl-aarch64.so.1 From b71f92ae33b15d9020c3277b985751b8336e9b57 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 16 Aug 2020 10:53:13 +0200 Subject: [PATCH 2/3] pinebookpro-uboot: remove stddef hack for musl --- srcpkgs/pinebookpro-uboot/template | 3 --- 1 file changed, 3 deletions(-) diff --git a/srcpkgs/pinebookpro-uboot/template b/srcpkgs/pinebookpro-uboot/template index b1fdd304ed1..7df07bb9a71 100644 --- a/srcpkgs/pinebookpro-uboot/template +++ b/srcpkgs/pinebookpro-uboot/template @@ -20,9 +20,6 @@ do_fetch() { git clone https://git.eno.space/pbp-uboot.git cd pbp-uboot git reset --hard ${_commit_uboot} - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - touch include/stddef.h - fi cd "${wrksrc}" git clone https://github.com/ARM-software/arm-trusted-firmware.git From c413dc17fd0966bf2e073a0f937f3f0e0b6807a9 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 16 Aug 2020 10:53:13 +0200 Subject: [PATCH 3/3] u-boot-tools: remove stddef hack for musl --- srcpkgs/u-boot-tools/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index 0c166b42dc9..0859350f18a 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -20,7 +20,6 @@ if [ "$CROSS_BUILD" ]; then fi post_extract() { - touch include/stddef.h # musl hack vsed '1itypedef unsigned long ulong;' \ -i include/image.h \ -i include/env.h \ @@ -32,6 +31,12 @@ do_configure() { make ${makejobs} ${make_build_args} tools-only_defconfig } +do_check() { + # skip tests for now. requires some gymnastics to make the python scripts + # find libfdt. the most useful target appears to be "make tcheck" + : ; +} + do_install() { ln -sf fw_printenv tools/env/fw_setenv for x in dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \