srcpkgs/a*: convert patches to -Np1
* arduino and antiword 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
```
2021-06-19 04:18:31 +02:00
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
azpainter: fix build
the configure script was erasing the enviroment's compiler/cflags
setting, which resulted in broken builds with ccache enabled - this
is because with ccache we have a bunch of symlinks installed, one
of which is clang, and the configure script's autodetection first
checks for clang and then for gcc
however, there is no actual clang installed, and their check is
wrong, as it uses 'type' rather than 'command' and the former
will also succeed for broken symlinks (as it only checks the
existence of the path, regardless of if it's broken or not)
that said, even with ccache off, this would still build wrong,
since it would be ignoring the compiler flags on native builds,
and additionally the cross-compiling environment on cross builds
2020-12-11 01:16:28 +01:00
|
|
|
@@ -150,10 +150,11 @@ fc_check_command_err sed
|
|
|
|
|
#-------------
|
|
|
|
|
# option
|
|
|
|
|
|
|
|
|
|
-CC=
|
|
|
|
|
-CFLAGS=
|
|
|
|
|
-LDFLAGS=
|
|
|
|
|
-LIBS=
|
|
|
|
|
+# sketchy nonsense overriding our environment
|
|
|
|
|
+#CC=
|
|
|
|
|
+#CFLAGS=
|
|
|
|
|
+#LDFLAGS=
|
|
|
|
|
+#LIBS=
|
|
|
|
|
|
|
|
|
|
CFLAGS_ADD=
|
|
|
|
|
LDFLAGS_ADD=
|
