ae69000001
* 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
```
21 lines
516 B
Diff
21 lines
516 B
Diff
# reason:
|
|
# upstream believes Ubuntu/Debian are the only ones
|
|
# to report "$(uname -s)-$(uname -m)" as Linux-x86_64 ...
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -138,14 +138,6 @@
|
|
LIBRARY_REL ?= lib
|
|
PKGCONFIG_REL ?= libdata
|
|
|
|
-else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64)
|
|
-
|
|
-# default for Debian/Ubuntu x86_64
|
|
-BINARY_REL ?= bin
|
|
-INCLUDE_REL ?= include
|
|
-LIBRARY_REL ?= lib/x86_64-linux-gnu
|
|
-PKGCONFIG_REL ?= $(LIBRARY_REL)
|
|
-
|
|
else
|
|
|
|
# NetBSD, ... and Linux64/Linux32 variants that use plain lib directory
|