49cb564d14
* par 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
```
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
--- a/Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200
|
|
+++ b/Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100
|
|
@@ -181,8 +171,8 @@
|
|
_osx_support.customize_compiler(_config_vars)
|
|
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
|
|
|
|
- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
|
|
- get_config_vars('CC', 'CXX', 'CFLAGS',
|
|
+ (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
|
|
+ get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
|
|
'CCSHARED', 'LDSHARED', 'SO', 'AR',
|
|
'ARFLAGS')
|
|
|
|
@@ -206,7 +196,7 @@
|
|
if 'LDFLAGS' in os.environ:
|
|
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
|
|
if 'CFLAGS' in os.environ:
|
|
- cflags = cflags + ' ' + os.environ['CFLAGS']
|
|
+ cflags = opt + ' ' + os.environ['CFLAGS']
|
|
ldshared = ldshared + ' ' + os.environ['CFLAGS']
|
|
if 'CPPFLAGS' in os.environ:
|
|
cpp = cpp + ' ' + os.environ['CPPFLAGS']
|