2021-04-25 22:53:14 +07:00
|
|
|
Index: mozc/src/gyp/common.gypi
|
|
|
|
|
===================================================================
|
srcpkgs/m*: convert patches to -Np1
```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
```
2021-06-19 10:03:21 +07:00
|
|
|
--- a/mozc/src/gyp/common.gypi
|
|
|
|
|
+++ b/mozc/src/gyp/common.gypi
|
2021-04-25 22:53:14 +07:00
|
|
|
@@ -105,7 +105,7 @@
|
|
|
|
|
],
|
|
|
|
|
# Libraries for GNU/Linux environment.
|
|
|
|
|
'linux_ldflags': [
|
|
|
|
|
- '-lc++',
|
|
|
|
|
+ '-lstdc++',
|
|
|
|
|
'-pthread',
|
|
|
|
|
],
|
|
|
|
|
|
|
|
|
|
@@ -205,7 +205,6 @@
|
|
|
|
|
'-Wtype-limits',
|
|
|
|
|
],
|
|
|
|
|
'cflags_cc': [
|
|
|
|
|
- '-stdlib=libc++',
|
|
|
|
|
'-Wno-covered-switch-default',
|
|
|
|
|
'-Wno-unnamed-type-template-args',
|
|
|
|
|
'-Wno-c++11-narrowing',
|
|
|
|
|
@@ -225,7 +224,6 @@
|
|
|
|
|
'-Wtype-limits',
|
|
|
|
|
],
|
|
|
|
|
'cflags_cc': [
|
|
|
|
|
- '-stdlib=libc++',
|
|
|
|
|
'-Wno-covered-switch-default',
|
|
|
|
|
'-Wno-unnamed-type-template-args',
|
|
|
|
|
'-Wno-c++11-narrowing',
|
