From 94fddfd7fd8befff8756d45ac484c4e03e69c44c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 8 Feb 2017 13:09:26 +0000 Subject: [PATCH] - missed this one --- php-paths.patch | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 php-paths.patch diff --git a/php-paths.patch b/php-paths.patch new file mode 100644 index 0000000..b142f47 --- /dev/null +++ b/php-paths.patch @@ -0,0 +1,41 @@ +Only in php-7.0.15: php-paths.patch +diff -ur php-7.0.15.orig/scripts/Makefile.frag php-7.0.15/scripts/Makefile.frag +--- php-7.0.15.orig/scripts/Makefile.frag 2017-01-17 11:51:48.000000000 +0000 ++++ php-7.0.15/scripts/Makefile.frag 2017-02-08 12:55:12.675405862 +0000 +@@ -3,8 +3,8 @@ + # Build environment install + # + +-phpincludedir = $(includedir)/php +-phpbuilddir = $(libdir)/build ++phpincludedir = $(includedir)/php/php$(program_suffix) ++phpbuilddir = $(libdir)/php/php$(program_suffix)/build + + BUILD_FILES = \ + scripts/phpize.m4 \ +diff -ur php-7.0.15.orig/scripts/php-config.in php-7.0.15/scripts/php-config.in +--- php-7.0.15.orig/scripts/php-config.in 2017-01-17 11:51:48.000000000 +0000 ++++ php-7.0.15/scripts/php-config.in 2017-02-08 12:55:12.676405862 +0000 +@@ -6,7 +6,7 @@ + exec_prefix="@exec_prefix@" + version="@PHP_VERSION@" + vernum="@PHP_VERSION_ID@" +-include_dir="@includedir@/php" ++include_dir="@includedir@/php/php@program_suffix@" + includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" +diff -ur php-7.0.15.orig/scripts/phpize.in php-7.0.15/scripts/phpize.in +--- php-7.0.15.orig/scripts/phpize.in 2017-01-17 11:51:48.000000000 +0000 ++++ php-7.0.15/scripts/phpize.in 2017-02-08 12:55:12.676405862 +0000 +@@ -4,8 +4,8 @@ + prefix='@prefix@' + datarootdir='@datarootdir@' + exec_prefix="`eval echo @exec_prefix@`" +-phpdir="`eval echo @libdir@`/build" +-includedir="`eval echo @includedir@`/php" ++phpdir="`eval echo @libdir@`/php/php@program_suffix@/build" ++includedir="`eval echo @includedir@`/php/php@program_suffix@" + builddir="`pwd`" + SED="@SED@" + -- 2.46.0