libplist-sh.patch

   1 --- libplist-2.2.0/configure.ac.orig    2020-06-15 14:45:49.000000000 +0200
   2 +++ libplist-2.2.0/configure.ac 2020-09-12 08:15:33.382297575 +0200
   3 @@ -154,7 +154,7 @@
   4  GLOBAL_LDFLAGS="$PTHREAD_LIBS"
   5
   6  if test "x$ac_cv_fmin_builtin" != "xyes"; then
   7 -       GLOBAL_LDFLAGS+=" -lm"
   8 +       GLOBAL_LDFLAGS="$GLOBAL_LDFLAGS -lm"
   9  fi
  10
  11  AC_ARG_ENABLE(debug,
  12 @@ -169,7 +169,7 @@
  13
  14  if (test "x$debug" = "xyes"); then
  15         AC_DEFINE(DEBUG, 1, [Define if debug message output code should be built.])
  16 -       GLOBAL_CFLAGS+=" -g"
  17 +       GLOBAL_CFLAGS="$GLOBAL_CFLAGS -g"
  18  fi
  19
  20  AC_SUBST(GLOBAL_CFLAGS)
  21 @@ -201,23 +201,23 @@
  22
  23  if test "x$build_sanitizers" = "xyes"; then
  24      AS_COMPILER_FLAG([-fsanitize=address], [
  25 -        SANITIZER_FLAGS+=" -fsanitize=address"
  26 +        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=address"
  27          ASAN_AVAILABLE=yes
  28      ], [])
  29      if test "$ASAN_AVAILABLE" = "yes"; then
  30          AS_COMPILER_FLAG([-fsanitize=address -fsanitize-address-use-after-scope], [
  31 -            SANITIZER_FLAGS+=" -fsanitize-address-use-after-scope"
  32 +            SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-address-use-after-scope"
  33          ], [])
  34 -        SANITIZERS+="ASAN "
  35 +        SANITIZERS="${SANITIZERS}ASAN "
  36      fi
  37
  38      AS_COMPILER_FLAG([-fsanitize=undefined], [
  39 -        SANITIZER_FLAGS+=" -fsanitize=undefined"
  40 +        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize=undefined"
  41          UBSAN_AVAILABLE=yes
  42      ], [])
  43
  44      if test "$UBSAN_AVAILABLE" = "yes"; then
  45 -        SANITIZERS+="UBSAN "
  46 +        SANITIZERS="${SANITIZERS}UBSAN "
  47      fi
  48
  49      if test -z "$SANITIZER_FLAGS"; then
  50 @@ -230,13 +230,13 @@
  51              if test -z "$SAN_COV_FLAGS"; then
  52                  SAN_COV_FLAGS="$COV_CHECK"
  53              else
  54 -                SAN_COV_FLAGS+=",$COV_CHECK"
  55 +                SAN_COV_FLAGS="${SAN_COV_FLAGS},$COV_CHECK"
  56              fi
  57          ], [])
  58      done
  59      if test -n "$SAN_COV_FLAGS"; then
  60 -        SANITIZER_FLAGS+=" -fsanitize-coverage=$SAN_COV_FLAGS"
  61 -        SANITIZERS+="+coverage "
  62 +        SANITIZER_FLAGS="$SANITIZER_FLAGS -fsanitize-coverage=$SAN_COV_FLAGS"
  63 +        SANITIZERS="${SANITIZERS}+coverage "
  64      else
  65          AC_MSG_WARN([No sanitizer coverage supported by compiler])
  66      fi
  67 @@ -244,20 +244,20 @@
  68      CFLAGS="-O1"
  69
  70      AS_COMPILER_FLAG([-fno-omit-frame-pointer], [
  71 -        CFLAGS+=" -fno-omit-frame-pointer"
  72 +        CFLAGS="$CFLAGS -fno-omit-frame-pointer"
  73      ], [])
  74
  75      AS_COMPILER_FLAG([-gline-tables-only], [
  76 -        CFLAGS+=" -gline-tables-only"
  77 +        CFLAGS="$CFLAGS -gline-tables-only"
  78      ],
  79      [
  80 -        CFLAGS+=" -g"
  81 +        CFLAGS="$CFLAGS -g"
  82      ])
  83
  84 -    EXTRA_CONF+="  Enabled sanitizers ......: $SANITIZERS
  85 +    EXTRA_CONF="$EXTRA_CONF  Enabled sanitizers ......: $SANITIZERS
  86  "
  87
  88 -    CFLAGS+=" $SANITIZER_FLAGS"
  89 +    CFLAGS="$CFLAGS $SANITIZER_FLAGS"
  90      CXXFLAGS="$CFLAGS -std=c++11"
  91  fi
  92
  93 @@ -266,9 +266,9 @@
  94          AC_MSG_WARN([building fuzzers requires clang/clang++ (continuing anyway)])
  95      fi
  96
  97 -    CFLAGS+=" -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
  98 +    CFLAGS="$CFLAGS -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
  99
 100 -    EXTRA_CONF+="  Build fuzzers ...........: yes
 101 +    EXTRA_CONF="$EXTRA_CONF  Build fuzzers ...........: yes
 102  "
 103  fi
 104