b6bcd8cd34
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
17 lines
536 B
Diff
17 lines
536 B
Diff
diff --git config/meson.build config/meson.build
|
|
index 2bafea5..6b15f13 100644
|
|
--- a/config/meson.build
|
|
+++ b/config/meson.build
|
|
@@ -50,11 +50,7 @@ meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
|
|
pmd_subdir_opt)
|
|
|
|
# set the machine type and cflags for it
|
|
-if meson.is_cross_build()
|
|
- machine = host_machine.cpu()
|
|
-else
|
|
- machine = get_option('machine')
|
|
-endif
|
|
+machine = get_option('machine')
|
|
|
|
# machine type 'default' is special, it defaults to the per arch agreed common
|
|
# minimal baseline needed for DPDK.
|