From cd05ee7a92589395e9848d22437b4ba1ba3b8a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 10 Jun 2020 16:44:31 +0200 Subject: [PATCH] cross-powerpc-linux-musl: apply musl patches [ci skip] --- .../cross-powerpc-linux-musl/files/ppc-pt_regs.patch | 1 - srcpkgs/cross-powerpc-linux-musl/template | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch diff --git a/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch deleted file mode 120000 index 983d54dc1d9..00000000000 --- a/srcpkgs/cross-powerpc-linux-musl/files/ppc-pt_regs.patch +++ /dev/null @@ -1 +0,0 @@ -../../musl/patches/ppc-pt_regs.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index f395c0a7143..fc7ca0cb7bf 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -156,11 +156,15 @@ _musl_build() { [ -f ${wrksrc}/.musl_build_done ] && return 0 cd ${wrksrc}/musl-${_musl_version} - - _apply_patch -p0 ${FILESDIR}/ppc-pt_regs.patch - msg_normal "Building cross musl libc\n" + # Apply musl patches if there are any + if [ -d "${XBPS_SRCPKGDIR}/musl/patches" ]; then + for f in ${XBPS_SRCPKGDIR}/musl/patches/*.patch; do + _apply_patch -p0 "$f" + done + fi + CC="${_triplet}-gcc" CFLAGS="-Os -pipe -fPIC ${_archflags}" \ ./configure --prefix=/usr