Merge pull request #392 from micmac1/openwrt-18.06-AST-2018-010

[feed/telephony.git] / net / freeswitch-stable / patches / 240-mod_v8.patch

diff --git a/net/freeswitch-stable/patches/240-mod_v8.patch b/net/freeswitch-stable/patches/240-mod_v8.patch
index c438bdbf0d918ea67ac518c4964b25c8d51ca054..21e3dc9b1060f1f77720e58486b9c5a166bf41f1 100644 (file)
--- a/net/freeswitch-stable/patches/240-mod_v8.patch
+++ b/net/freeswitch-stable/patches/240-mod_v8.patch
@@ -1,6 +1,6 @@
 --- a/src/mod/languages/mod_v8/Makefile.am
 +++ b/src/mod/languages/mod_v8/Makefile.am
-@@ -15,7 +15,7 @@ V8_LIBEXT=dylib
+@@ -15,12 +15,17 @@ V8_LIBEXT=dylib
  V8_BUILDPARAMS=snapshot=off i18nsupport=off
  V8_SNAPSHOT=nosnapshot
  else
@@ -9,7 +9,17 @@
  V8_LIBEXT=so
  # Some gcc versions report warnings incorrectly
  V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off
-@@ -29,8 +29,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
++if DISABLE_SNAPSHOT_V8
++V8_BUILDPARAMS+=snapshot=off
++V8_SNAPSHOT=nosnapshot
++else
+ V8_SNAPSHOT=snapshot
+ endif
++endif
+ 
+ if ENABLE_STATIC_V8
+ # Build the static lib version of V8
+@@ -29,8 +34,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
  V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native
  V8_CXXFLAGS =
  else
@@ -20,7 +30,7 @@
  V8_CXXFLAGS = -fPIC
  endif
  V8LIB=$(V8_STATIC_DIR)/libv8_base*.a
-@@ -46,11 +46,6 @@ else
+@@ -46,11 +51,6 @@ else
  V8_EXTRA_BUILD_PARAMS=--no-parallel
  endif
  
@@ -32,7 +42,7 @@
  MODNAME=mod_v8
  
  AM_CFLAGS    += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
-@@ -121,21 +116,13 @@ $(V8_DIR)/.stamp-patch: $(V8_DIR)
+@@ -121,21 +121,13 @@ $(V8_DIR)/.stamp-patch: $(V8_DIR)
  
  $(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch
        mkdir -p $(V8_BUILDDIR)
@@ -61,3 +71,17 @@
  
  if ENABLE_STATIC_V8
  install-exec-local: $(V8LIB)
+--- a/configure.ac
++++ b/configure.ac
+@@ -1519,6 +1519,11 @@ AC_ARG_ENABLE(parallel-build-v8,
+ [AS_HELP_STRING([--disable-parallel-build-v8], [Disable parallel build of V8])], [enable_parallel_build_v8="$enableval"], [enable_parallel_build_v8="yes"])
+ AM_CONDITIONAL([ENABLE_PARALLEL_BUILD_V8],[test "x$enable_parallel_build_v8" != "xno"])
+ 
++# Option to force heap snapshot generation of Google's V8 to off
++AC_ARG_ENABLE(snapshot-v8,
++[AS_HELP_STRING([--disable-snapshot-v8], [Disable heap snapshot generation of V8])], [enable_snapshot_v8="$enableval"], [enable_snapshot_v8="yes"])
++AM_CONDITIONAL([DISABLE_SNAPSHOT_V8],[test "x$enable_snapshot_v8" != "xyes"])
++
+ AM_CONDITIONAL([HAVE_ODBC],[test "x$enable_core_odbc_support" != "xno"])
+ AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"])
+