net/freeswitch-stable/patches/240-mod_v8.patch

   1 --- a/src/mod/languages/mod_v8/Makefile.am
   2 +++ b/src/mod/languages/mod_v8/Makefile.am
   3 @@ -15,12 +15,17 @@ V8_LIBEXT=dylib
   4  V8_BUILDPARAMS=snapshot=off i18nsupport=off
   5  V8_SNAPSHOT=nosnapshot
   6  else
   7 -V8_LIBDIR=$(V8_BUILDDIR)/out/native/lib.target
   8 +V8_LIBDIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/lib.target
   9  V8_LIBEXT=so
  10  # Some gcc versions report warnings incorrectly
  11  V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off
  12 +if DISABLE_SNAPSHOT_V8
  13 +V8_BUILDPARAMS+=snapshot=off
  14 +V8_SNAPSHOT=nosnapshot
  15 +else
  16  V8_SNAPSHOT=snapshot
  17  endif
  18 +endif
  19
  20  if ENABLE_STATIC_V8
  21  # Build the static lib version of V8
  22 @@ -29,8 +34,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
  23  V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native
  24  V8_CXXFLAGS =
  25  else
  26 -V8_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/tools/gyp
  27 -V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/third_party/icu
  28 +V8_STATIC_DIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/obj.target/tools/gyp
  29 +V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/obj.target/third_party/icu
  30  V8_CXXFLAGS = -fPIC
  31  endif
  32  V8LIB=$(V8_STATIC_DIR)/libv8_base*.a
  33 @@ -46,11 +51,6 @@ else
  34  V8_EXTRA_BUILD_PARAMS=--no-parallel
  35  endif
  36
  37 -# Try to find the target platform for our configured CXX compiler
  38 -# Parse the result one extra time to handle different i386 platforms (i386, i486 etc)
  39 -CXX_TARGET_PLATFORM := $(shell $(CXX) -v 2>&1 | grep Target | cut '-d:' -f2 | cut '-d-' -f1 | tr -d ' ')
  40 -CXX_TARGET_PLATFORM_I386 := $(shell echo "$(CXX_TARGET_PLATFORM)" | sed 's/^\(.\{1\}\)\(.\{1\}\)/\13/')
  41 -
  42  MODNAME=mod_v8
  43
  44  AM_CFLAGS    += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
  45 @@ -121,21 +121,13 @@ $(V8_DIR)/.stamp-patch: $(V8_DIR)
  46
  47  $(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch
  48         mkdir -p $(V8_BUILDDIR)
  49 -       if test "$(CXX_TARGET_PLATFORM)" = "x86_64"; then \
  50 -          defines="v8_target_arch=x64 target_arch=x64"; \
  51 -       else \
  52 -          if test "$(CXX_TARGET_PLATFORM)" = "arm"; then \
  53 -             defines="v8_target_arch=arm target_arch=arm"; \
  54 -          else \
  55 -             if test "$(CXX_TARGET_PLATFORM_I386)" = "i386"; then \
  56 -                defines="v8_target_arch=ia32 target_arch=ia32"; \
  57 -             fi; \
  58 -          fi; \
  59 -       fi; \
  60 -       cd $(V8_BUILDDIR) && CFLAGS="$(V8_CXXFLAGS)" CXXFLAGS="$(V8_CXXFLAGS)" \
  61 -       LINK=@CXX@ CXX=@CXX@ GYPFLAGS="$(V8_EXTRA_BUILD_PARAMS)" GYP_DEFINES="$$defines" \
  62 -       OUTDIR=$(V8_BUILDDIR)/out \
  63 -       PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(PYTHONPATH)" $(MAKE) -C $(V8_DIR) $(V8_BUILDPARAMS) native
  64 +       cd $(V8_BUILDDIR) && sed -i "/'want_separate_host_toolset': 0,/s/0/1/" build/standalone.gypi && \
  65 +       $(DEFAULT_VARS) CFLAGS+="$(V8_CXXFLAGS)" CXXFLAGS+="$(V8_CXXFLAGS)" \
  66 +       LINK=@CXX@ CXX=@CXX@ GYPFLAGS="$(V8_EXTRA_BUILD_PARAMS)" OUTDIR=./out/ \
  67 +       PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(FS_STABLE_HOST_PYTHONPATH)" $(MAKE) -C $(V8_DIR) \
  68 +       CC.host="$(FS_STABLE_HOSTCC)" CFLAGS.host="$(FS_STABLE_HOST_CFLAGS)" CXX.host="$(FS_STABLE_HOSTCXX)" \
  69 +       CXXFLAGS.host="$(FS_STABLE_HOST_CFLAGS)" LDFLAGS.host="$(FS_STABLE_HOST_LDFLAGS)" \
  70 +       $(V8_BUILDPARAMS) $(FS_STABLE_MYDEFINES) $(FS_STABLE_MYARCH).release
  71
  72  if ENABLE_STATIC_V8
  73  install-exec-local: $(V8LIB)
  74 --- a/configure.ac
  75 +++ b/configure.ac
  76 @@ -1519,6 +1519,11 @@ AC_ARG_ENABLE(parallel-build-v8,
  77  [AS_HELP_STRING([--disable-parallel-build-v8], [Disable parallel build of V8])], [enable_parallel_build_v8="$enableval"], [enable_parallel_build_v8="yes"])
  78  AM_CONDITIONAL([ENABLE_PARALLEL_BUILD_V8],[test "x$enable_parallel_build_v8" != "xno"])
  79
  80 +# Option to force heap snapshot generation of Google's V8 to off
  81 +AC_ARG_ENABLE(snapshot-v8,
  82 +[AS_HELP_STRING([--disable-snapshot-v8], [Disable heap snapshot generation of V8])], [enable_snapshot_v8="$enableval"], [enable_snapshot_v8="yes"])
  83 +AM_CONDITIONAL([DISABLE_SNAPSHOT_V8],[test "x$enable_snapshot_v8" != "xyes"])
  84 +
  85  AM_CONDITIONAL([HAVE_ODBC],[test "x$enable_core_odbc_support" != "xno"])
  86  AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"])
  87