moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

do-patch: switch default patch_args to -Np1

Browse source 
All templates that require -Np0 have patch_args appended.
Let's flip the switch.
This commit is contained in:
Đoàn Trần Công Danh 2021-06-18 07:38:20 +07:00 • committed by Đoàn Trần Công Danh
parent ef11f57681
commit 8b25a1449b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Manual.md
View file

@ -601,7 +601,7 @@ current directory with respect to the install.
- `patch_args` The arguments to be passed in to the `patch(1)` command when applying - `patch_args` The arguments to be passed in to the `patch(1)` command when applying
patches to the package sources during `do_patch()`. Patches are stored in patches to the package sources during `do_patch()`. Patches are stored in
`srcpkgs/<pkgname>/patches` and must be in `-p0` format. By default set to `-Np0`. `srcpkgs/<pkgname>/patches` and must be in `-p1` format. By default set to `-Np1`.
- `disable_parallel_build` If set the package won't be built in parallel - `disable_parallel_build` If set the package won't be built in parallel
and `XBPS_MAKEJOBS` has no effect. and `XBPS_MAKEJOBS` has no effect.
@ -874,7 +874,7 @@ been found or to fix compilation with new software.
To handle this, xbps-src has patching functionality. It will look for all files To handle this, xbps-src has patching functionality. It will look for all files
that match the glob `srcpkgs/$pkgname/patches/*.{diff,patch}` and will that match the glob `srcpkgs/$pkgname/patches/*.{diff,patch}` and will
automatically apply all files it finds using `patch(1)` with `-Np0`. This happens automatically apply all files it finds using `patch(1)` with `-Np1`. This happens
during the `do_patch()` phase. The variable `PATCHESDIR` is during the `do_patch()` phase. The variable `PATCHESDIR` is
available in the template, pointing to the `patches` directory. available in the template, pointing to the `patches` directory.

2
common/hooks/do-patch/00-patches.sh
View file

@ -3,7 +3,7 @@
_process_patch() { _process_patch() {
local _args= _patch= i=$1 local _args= _patch= i=$1
_args="-Np0" _args="-Np1"
_patch=${i##*/} _patch=${i##*/}
if [ -f $PATCHESDIR/${_patch}.args ]; then if [ -f $PATCHESDIR/${_patch}.args ]; then