]>
Commit | Line | Data |
---|---|---|
ac05ab41 JB |
1 | --- libplist-2.3.0/configure.ac.orig 2023-04-21 14:07:43.000000000 +0200 |
2 | +++ libplist-2.3.0/configure.ac 2023-11-25 21:12:09.871666005 +0100 | |
3 | @@ -179,7 +179,7 @@ esac], | |
cf229d4a JB |
4 | |
5 | if (test "x$debug" = "xyes"); then | |
6 | AC_DEFINE(DEBUG, 1, [Define if debug message output code should be built.]) | |
7 | - GLOBAL_CFLAGS+=" -g" | |
8 | + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -g" | |
9 | fi | |
10 | ||
11 | AC_SUBST(GLOBAL_CFLAGS) | |
ac05ab41 | 12 | @@ -211,23 +211,23 @@ fi |
cf229d4a JB |
13 | |
14 | if test "x$build_sanitizers" = "xyes"; then | |
15 | AS_COMPILER_FLAG([-fsanitize=address], [ | |
16 | - SANITIZER_FLAGS+=" -fsanitize=address" | |
17 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=address" | |
18 | ASAN_AVAILABLE=yes | |
19 | ], []) | |
20 | if test "$ASAN_AVAILABLE" = "yes"; then | |
21 | AS_COMPILER_FLAG([-fsanitize=address -fsanitize-address-use-after-scope], [ | |
22 | - SANITIZER_FLAGS+=" -fsanitize-address-use-after-scope" | |
23 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-address-use-after-scope" | |
24 | ], []) | |
25 | - SANITIZERS+="ASAN " | |
26 | + SANITIZERS="${SANITIZERS}ASAN " | |
27 | fi | |
28 | ||
29 | AS_COMPILER_FLAG([-fsanitize=undefined], [ | |
30 | - SANITIZER_FLAGS+=" -fsanitize=undefined" | |
31 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=undefined" | |
32 | UBSAN_AVAILABLE=yes | |
33 | ], []) | |
34 | ||
35 | if test "$UBSAN_AVAILABLE" = "yes"; then | |
36 | - SANITIZERS+="UBSAN " | |
37 | + SANITIZERS="${SANITIZERS}UBSAN " | |
38 | fi | |
39 | ||
40 | if test -z "$SANITIZER_FLAGS"; then | |
ac05ab41 | 41 | @@ -240,13 +240,13 @@ if test "x$build_sanitizers" = "xyes"; t |
cf229d4a JB |
42 | if test -z "$SAN_COV_FLAGS"; then |
43 | SAN_COV_FLAGS="$COV_CHECK" | |
44 | else | |
45 | - SAN_COV_FLAGS+=",$COV_CHECK" | |
46 | + SAN_COV_FLAGS="${SAN_COV_FLAGS},$COV_CHECK" | |
47 | fi | |
48 | ], []) | |
49 | done | |
50 | if test -n "$SAN_COV_FLAGS"; then | |
51 | - SANITIZER_FLAGS+=" -fsanitize-coverage=$SAN_COV_FLAGS" | |
52 | - SANITIZERS+="+coverage " | |
53 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-coverage=$SAN_COV_FLAGS" | |
54 | + SANITIZERS="${SANITIZERS}+coverage " | |
55 | else | |
56 | AC_MSG_WARN([No sanitizer coverage supported by compiler]) | |
57 | fi | |
ac05ab41 | 58 | @@ -254,20 +254,20 @@ if test "x$build_sanitizers" = "xyes"; t |
cf229d4a JB |
59 | CFLAGS="-O1" |
60 | ||
61 | AS_COMPILER_FLAG([-fno-omit-frame-pointer], [ | |
62 | - CFLAGS+=" -fno-omit-frame-pointer" | |
63 | + CFLAGS="$CFLAGS -fno-omit-frame-pointer" | |
64 | ], []) | |
65 | ||
66 | AS_COMPILER_FLAG([-gline-tables-only], [ | |
67 | - CFLAGS+=" -gline-tables-only" | |
68 | + CFLAGS="$CFLAGS -gline-tables-only" | |
69 | ], | |
70 | [ | |
71 | - CFLAGS+=" -g" | |
72 | + CFLAGS="$CFLAGS -g" | |
73 | ]) | |
74 | ||
75 | - EXTRA_CONF+=" Enabled sanitizers ......: $SANITIZERS | |
76 | + EXTRA_CONF="$EXTRA_CONF Enabled sanitizers ......: $SANITIZERS | |
77 | " | |
78 | ||
79 | - CFLAGS+=" $SANITIZER_FLAGS" | |
80 | + CFLAGS="$CFLAGS $SANITIZER_FLAGS" | |
81 | CXXFLAGS="$CFLAGS -std=c++11" | |
82 | fi | |
83 | ||
ac05ab41 JB |
84 | @@ -281,9 +281,9 @@ if test "x$build_fuzzers" = "xyes"; then |
85 | ;; | |
86 | esac | |
cf229d4a JB |
87 | |
88 | - CFLAGS+=" -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" | |
89 | + CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" | |
90 | ||
91 | - EXTRA_CONF+=" Build fuzzers ...........: yes | |
92 | + EXTRA_CONF="$EXTRA_CONF Build fuzzers ...........: yes | |
93 | " | |
94 | fi | |
95 |