be5369a0cb
* fpc 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
```
18 lines
572 B
Diff
18 lines
572 B
Diff
diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
|
|
index f7f696f..e96ee33 100644
|
|
--- a/makefiles/arch/desktop.mk
|
|
+++ b/makefiles/arch/desktop.mk
|
|
@@ -7,10 +7,8 @@ IMAGEDIR = $(INSTALLDIR)/share/pixmaps
|
|
APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME%
|
|
|
|
|
|
-CCACHE = $(shell if which ccache > /dev/null; then echo "ccache"; fi) #if ccache is not installed, do not use it
|
|
-CC = $(CCACHE) gcc
|
|
-AR = ar rsu
|
|
-LD = g++
|
|
+AR := ${AR} rsu
|
|
+LD := ${CXX}
|
|
|
|
CFLAGS += -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG -fPIC
|
|
LDFLAGS =
|
|
|