]>
Commit | Line | Data |
---|---|---|
1 | --- libplist-2.4.0/configure.ac.orig 2024-02-21 01:49:54.000000000 +0100 | |
2 | +++ libplist-2.4.0/configure.ac 2024-02-25 08:40:35.228846020 +0100 | |
3 | @@ -189,16 +189,16 @@ esac], | |
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 | if test "x$enable_static" = "xyes" -a "x$enable_shared" = "xno"; then | |
12 | - GLOBAL_CFLAGS+=" -DLIBPLIST_STATIC" | |
13 | + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -DLIBPLIST_STATIC" | |
14 | fi | |
15 | ||
16 | GLOBAL_CXXFLAGS=$GLOBAL_CFLAGS | |
17 | AS_COMPILER_FLAG([-fvisibility=hidden], [ | |
18 | - GLOBAL_CFLAGS+=" -fvisibility=hidden" | |
19 | + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fvisibility=hidden" | |
20 | ], []) | |
21 | ||
22 | AC_SUBST(GLOBAL_CFLAGS) | |
23 | @@ -237,23 +237,23 @@ fi | |
24 | ||
25 | if test "x$build_sanitizers" = "xyes"; then | |
26 | AS_COMPILER_FLAG([-fsanitize=address], [ | |
27 | - SANITIZER_FLAGS+=" -fsanitize=address" | |
28 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=address" | |
29 | ASAN_AVAILABLE=yes | |
30 | ], []) | |
31 | if test "$ASAN_AVAILABLE" = "yes"; then | |
32 | AS_COMPILER_FLAG([-fsanitize=address -fsanitize-address-use-after-scope], [ | |
33 | - SANITIZER_FLAGS+=" -fsanitize-address-use-after-scope" | |
34 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-address-use-after-scope" | |
35 | ], []) | |
36 | - SANITIZERS+="ASAN " | |
37 | + SANITIZERS="${SANITIZERS}ASAN " | |
38 | fi | |
39 | ||
40 | AS_COMPILER_FLAG([-fsanitize=undefined], [ | |
41 | - SANITIZER_FLAGS+=" -fsanitize=undefined" | |
42 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=undefined" | |
43 | UBSAN_AVAILABLE=yes | |
44 | ], []) | |
45 | ||
46 | if test "$UBSAN_AVAILABLE" = "yes"; then | |
47 | - SANITIZERS+="UBSAN " | |
48 | + SANITIZERS="${SANITIZERS}UBSAN " | |
49 | fi | |
50 | ||
51 | if test -z "$SANITIZER_FLAGS"; then | |
52 | @@ -266,13 +266,13 @@ if test "x$build_sanitizers" = "xyes"; t | |
53 | if test -z "$SAN_COV_FLAGS"; then | |
54 | SAN_COV_FLAGS="$COV_CHECK" | |
55 | else | |
56 | - SAN_COV_FLAGS+=",$COV_CHECK" | |
57 | + SAN_COV_FLAGS="${SAN_COV_FLAGS},$COV_CHECK" | |
58 | fi | |
59 | ], []) | |
60 | done | |
61 | if test -n "$SAN_COV_FLAGS"; then | |
62 | - SANITIZER_FLAGS+=" -fsanitize-coverage=$SAN_COV_FLAGS" | |
63 | - SANITIZERS+="+coverage " | |
64 | + SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-coverage=$SAN_COV_FLAGS" | |
65 | + SANITIZERS="${SANITIZERS}+coverage " | |
66 | else | |
67 | AC_MSG_WARN([No sanitizer coverage supported by compiler]) | |
68 | fi | |
69 | @@ -280,20 +280,20 @@ if test "x$build_sanitizers" = "xyes"; t | |
70 | CFLAGS="-O1" | |
71 | ||
72 | AS_COMPILER_FLAG([-fno-omit-frame-pointer], [ | |
73 | - CFLAGS+=" -fno-omit-frame-pointer" | |
74 | + CFLAGS="$CFLAGS -fno-omit-frame-pointer" | |
75 | ], []) | |
76 | ||
77 | AS_COMPILER_FLAG([-gline-tables-only], [ | |
78 | - CFLAGS+=" -gline-tables-only" | |
79 | + CFLAGS="$CFLAGS -gline-tables-only" | |
80 | ], | |
81 | [ | |
82 | - CFLAGS+=" -g" | |
83 | + CFLAGS="$CFLAGS -g" | |
84 | ]) | |
85 | ||
86 | - EXTRA_CONF+=" Enabled sanitizers ......: $SANITIZERS | |
87 | + EXTRA_CONF="$EXTRA_CONF Enabled sanitizers ......: $SANITIZERS | |
88 | " | |
89 | ||
90 | - CFLAGS+=" $SANITIZER_FLAGS" | |
91 | + CFLAGS="$CFLAGS $SANITIZER_FLAGS" | |
92 | CXXFLAGS="$CFLAGS -std=c++11" | |
93 | fi | |
94 | ||
95 | @@ -307,9 +307,9 @@ if test "x$build_fuzzers" = "xyes"; then | |
96 | ;; | |
97 | esac | |
98 | ||
99 | - CFLAGS+=" -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" | |
100 | + CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" | |
101 | ||
102 | - EXTRA_CONF+=" Build fuzzers ...........: yes | |
103 | + EXTRA_CONF="$EXTRA_CONF Build fuzzers ...........: yes | |
104 | " | |
105 | fi | |
106 |