From ac921750c4ffef636283ce0d72a6ff6792245b5a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Apr 2019 13:46:14 +0200
Subject: New package

---
 v8-hack.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 v8-hack.patch

(limited to 'v8-hack.patch')

diff --git a/v8-hack.patch b/v8-hack.patch
new file mode 100644
index 0000000..49f4563
--- /dev/null
+++ b/v8-hack.patch
@@ -0,0 +1,58 @@
+diff -up ./config.m4.hack ./config.m4
+--- ./config.m4.hack	2019-04-24 12:16:06.018817259 +0200
++++ ./config.m4	2019-04-24 13:05:48.244406629 +0200
+@@ -17,7 +17,7 @@ if test "$PHP_V8" != "no"; then
+   V8_INCLUDE_DIR=""
+ 
+   SEARCH_PATH="/usr/local /usr"
+-  SEARCH_FOR="include/v8.h"
++  SEARCH_FOR="include/node/v8.h"
+ 
+   V8_MIN_API_VERSION_STR=6.6.313
+ 
+@@ -25,7 +25,7 @@ if test "$PHP_V8" != "no"; then
+ 
+   # Path where v8 from packages we recommend are installed, it's /opt/libv8-MAJOR.MINOR on Ubuntu
+   # and /usr/local/opt/v8@MAJOR.MINOR on macOS. For Docker image it's just /opt/libv8
+-  PRIORITY_SEARCH_PATH="/opt/libv8-${DESIRED_V8_VERSION} /usr/local/opt/v8@${DESIRED_V8_VERSION} /opt/libv8"
++  PRIORITY_SEARCH_PATH="/opt/libv8-${DESIRED_V8_VERSION} /usr/local/opt/v8@${DESIRED_V8_VERSION} /opt/libv8 /usr"
+   SEARCH_PATH="${PRIORITY_SEARCH_PATH} ${SEARCH_PATH}"
+ 
+   if test -r $PHP_V8/$SEARCH_FOR; then
+@@ -47,7 +47,7 @@ if test "$PHP_V8" != "no"; then
+   fi
+ 
+   V8_LIB_DIR=$V8_ROOT_DIR/$PHP_LIBDIR
+-  V8_INCLUDE_DIR=$V8_ROOT_DIR/include
++  V8_INCLUDE_DIR=$V8_ROOT_DIR/include/node
+ 
+   AC_MSG_CHECKING([for ICU data file icudtl.dat])
+ 
+@@ -63,16 +63,6 @@ if test "$PHP_V8" != "no"; then
+ 
+   AC_DEFINE_UNQUOTED([PHP_V8_ICU_DATA_DIR], ["$PHP_V8_ICU_DATA_DIR"], [ICU data path (trailing slash is required)])
+ 
+-  case $host_os in
+-    darwin* )
+-      # MacOS does not support --rpath
+-      LDFLAGS="-L$V8_LIB_DIR"
+-      ;;
+-    * )
+-      LDFLAGS="-Wl,--rpath=$V8_LIB_DIR -L$V8_LIB_DIR"
+-      ;;
+-  esac
+-
+   AC_CACHE_CHECK(for V8 version, ac_cv_v8_version, [
+     if test -z "$V8_INCLUDE_DIR/v8-version.h"; then
+       AC_MSG_RESULT([not found])
+@@ -110,9 +100,7 @@ if test "$PHP_V8" != "no"; then
+   PHP_ADD_INCLUDE($V8_DIR)
+   PHP_ADD_INCLUDE($V8_INCLUDE_DIR)
+ 
+-  PHP_ADD_LIBRARY_WITH_PATH(v8, $V8_LIB_DIR, V8_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY_WITH_PATH(v8_libbase, $V8_LIB_DIR, V8_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY_WITH_PATH(v8_libplatform, $V8_LIB_DIR, V8_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(node, $V8_LIB_DIR, V8_SHARED_LIBADD)
+ 
+   PHP_SUBST(V8_SHARED_LIBADD)
+   PHP_REQUIRE_CXX()
-- 
cgit