From 62f43c8edf34a5cce07973b6de1a56648b9daaa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 10 Jun 2020 16:44:38 +0200 Subject: [PATCH] cross-powerpc64le-linux-musl: apply musl patches [ci skip] --- .../files/ppc-pt_regs.patch | 1 - .../files/ppc64-fpregset_t.patch | 1 - srcpkgs/cross-powerpc64le-linux-musl/template | 11 +++++++---- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc-pt_regs.patch deleted file mode 120000 index 983d54dc1d9..00000000000 --- a/srcpkgs/cross-powerpc64le-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-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch deleted file mode 120000 index 0691c1fe49d..00000000000 --- a/srcpkgs/cross-powerpc64le-linux-musl/files/ppc64-fpregset_t.patch +++ /dev/null @@ -1 +0,0 @@ -../../musl/patches/ppc64-fpregset_t.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index efa2d63da54..810bc01192d 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -159,12 +159,15 @@ _musl_build() { [ -f ${wrksrc}/.musl_build_done ] && return 0 cd ${wrksrc}/musl-${_musl_version} - - _apply_patch -p0 ${FILESDIR}/ppc64-fpregset_t.patch - _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" LD="${_triplet}-ld" AR="${_triplet}-ar" \ AS="${_triplet}-as" RANLIB="${_triplet}-ranlib" \ CFLAGS="-Os -pipe -fPIC ${_archflags}" \