diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-22 09:29:20 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-22 09:29:22 +0200 |
| commit | f6f229b1f20fd172150cb3f90a5fcbb8082015ea (patch) | |
| tree | 9a622ed8be9a6e1ad77b58815f6f004489804f20 | |
| parent | 367854557b470a1d5b00b81de0e60e18abb2c454 (diff) | |
freeswitch-stable: backport apr fix
Backport from master.
The macro APR_TRY_COMPILE_NO_WARNING included in apr/apr-util is
incorrect. It results in extra brackets being put into conftest.c, for
example:
#include "confdefs.h"
[
#include <stddef.h>
#include <iconv.h>
]
int main(int argc, const char *const *argv) {
[
iconv(0,(char **)0,(size_t *)0,(char **)0,(size_t *)0);
]
return 0; }
The test always fails with:
error: expected identifier or '(' before '[' token
The following checks are affected:
- variable length arrays
- type of inbuf parameter to iconv
Fix from upstream (Apache).
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch b/net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch new file mode 100644 index 0000000..245e327 --- /dev/null +++ b/net/freeswitch-stable/patches/360-fix-APR_TRY_COMPILE_NO_WARNING.patch @@ -0,0 +1,50 @@ +--- a/libs/apr-util/build/apr_common.m4 ++++ b/libs/apr-util/build/apr_common.m4 +@@ -493,13 +493,15 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + if test "$ac_cv_prog_gcc" = "yes"; then + CFLAGS="$CFLAGS -Werror" + fi +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +- [#include "confdefs.h" +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] +- [[$2]] +- [ return 0; }]])], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [#include "confdefs.h" ++ ] ++ [[$1]] ++ [int main(int argc, const char *const *argv) {] ++ [[$2]] ++ [ return 0; }] ++ )], + [$3], [$4]) + CFLAGS=$apr_save_CFLAGS + ]) +--- a/libs/apr/build/apr_common.m4 ++++ b/libs/apr/build/apr_common.m4 +@@ -493,13 +493,15 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], + if test "$ac_cv_prog_gcc" = "yes"; then + CFLAGS="$CFLAGS -Werror" + fi +- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +- [#include "confdefs.h" +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] +- [[$2]] +- [ return 0; }]])], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [#include "confdefs.h" ++ ] ++ [[$1]] ++ [int main(int argc, const char *const *argv) {] ++ [[$2]] ++ [ return 0; }] ++ )], + [$3], [$4]) + CFLAGS=$apr_save_CFLAGS + ]) |