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

build-style/void-cross: fix after patch -Np1 transition

This commit is contained in:
q66 2021-06-20 17:54:31 +02:00
parent 2578c3ad47
commit 44f4cad4ec
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/build-style/void-cross.sh
View File

@ -20,9 +20,9 @@
# #
_void_cross_apply_patch() { _void_cross_apply_patch() {
local args="$1" pname="$(basename $2)" local pname="$(basename $1)"
if [ ! -f ".${pname}_done" ]; then if [ ! -f ".${pname}_done" ]; then
patch -N $args -i $2 patch -Np1 $args -i $1
touch .${pname}_done touch .${pname}_done
fi fi
} }
@ -38,7 +38,7 @@ _void_cross_build_binutils() {
cd ${wrksrc}/binutils-${ver} cd ${wrksrc}/binutils-${ver}
if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then
for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do
_void_cross_apply_patch -p1 "$f" _void_cross_apply_patch "$f"
done done
fi fi
cd .. cd ..
@ -92,11 +92,11 @@ _void_cross_build_bootstrap_gcc() {
sed -i 's@./fixinc.sh@-c true@' Makefile.in sed -i 's@./fixinc.sh@-c true@' Makefile.in
for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do
_void_cross_apply_patch -p0 "$f" _void_cross_apply_patch "$f"
done done
if [ -f ${wrksrc}/.musl_version ]; then if [ -f ${wrksrc}/.musl_version ]; then
for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do for f in ${XBPS_SRCPKGDIR}/gcc/files/*-musl.patch; do
_void_cross_apply_patch -p0 "$f" _void_cross_apply_patch "$f"
done done
fi fi
cd .. cd ..
@ -168,7 +168,7 @@ _void_cross_build_kernel_headers() {
cd ${wrksrc}/linux-${ver} cd ${wrksrc}/linux-${ver}
for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/kernel-libc-headers/patches/*.patch; do
_void_cross_apply_patch -p0 $f _void_cross_apply_patch "$f"
done done
cd .. cd ..
@ -207,7 +207,7 @@ _void_cross_build_glibc_headers() {
cd ${wrksrc}/glibc-${ver} cd ${wrksrc}/glibc-${ver}
if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then if [ -d "${XBPS_SRCPKGDIR}/glibc/patches" ]; then
for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/glibc/patches/*.patch; do
_void_cross_apply_patch -p1 "$f" _void_cross_apply_patch "$f"
done done
fi fi
cd .. cd ..
@ -291,7 +291,7 @@ _void_cross_build_musl() {
cd ${wrksrc}/musl-${ver} cd ${wrksrc}/musl-${ver}
if [ -d "${XBPS_SRCPKGDIR}/musl/patches" ]; then if [ -d "${XBPS_SRCPKGDIR}/musl/patches" ]; then
for f in ${XBPS_SRCPKGDIR}/musl/patches/*.patch; do for f in ${XBPS_SRCPKGDIR}/musl/patches/*.patch; do
_void_cross_apply_patch -p0 "$f" _void_cross_apply_patch "$f"
done done
fi fi
cd .. cd ..