ec4c2d75fa
```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
```
14 lines
522 B
Diff
14 lines
522 B
Diff
--- a/source/Makefile.mk
|
|
+++ b/source/Makefile.mk
|
|
@@ -233,10 +233,7 @@
|
|
# Check for optional libs (special non-pkgconfig tests)
|
|
|
|
ifneq ($(WIN32),true)
|
|
-
|
|
-# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it
|
|
-HAVE_LIBMAGIC = $(shell echo '\#include <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
|
|
-
|
|
+HAVE_LIBMAGIC = true
|
|
endif
|
|
|
|
# ---------------------------------------------------------------------------------------------------------------------
|