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
```
26 lines
977 B
Diff
26 lines
977 B
Diff
From 4d6820b2159e3d2ed0cf365e07b093fa79932f1e Mon Sep 17 00:00:00 2001
|
|
From: Jookia <166291@gmail.com>
|
|
Date: Thu, 9 Apr 2020 16:08:07 +1000
|
|
Subject: [PATCH] CMakeLists: Add -fsigned-char to mimic Makefile
|
|
|
|
This fixes the build on ARM.
|
|
---
|
|
CMakeLists.txt | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git CMakeLists.txt CMakeLists.txt
|
|
index 095d6e23b20..d0f5e0cc7f3 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -240,9 +240,10 @@ ELSE()
|
|
IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
|
|
SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
|
|
ENDIF()
|
|
+ SET(CATA_OTHER_FLAGS "${CATA_OTHER_FLAGS} -fsigned-char")
|
|
# Compact the whitespace in the warning string
|
|
string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
|
|
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
|
|
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} ${CATA_OTHER_FLAGS}")
|
|
SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
|
|
ENDIF()
|
|
|