fix PHP 7 built with --enable-opcache-file only on cedar-14

mkleywegt · Jul 9, 2018 · 46a623b · 46a623b
1 parent ba38755
commit 46a623b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - ext-blackfire/1.22.0 [David Zuelke]
 
+### FIX
+
+- PHP 7 built with --enable-opcache-file only on cedar-14 [David Zuelke]
+
 ## v137 (2018-06-26)
 
 ### ADD

diff --git a/support/build/php b/support/build/php
@@ -99,25 +99,17 @@ else
 	fi
 fi
 
-configureopts=
+configureopts=()
 if [[ $dep_version == 7.* ]]; then
-	configureopts="\
---enable-opcache-file\
-"
+	configureopts+=("--enable-opcache-file")
+
 	if [[ $dep_version == 7.0.* || $dep_version == 7.1.* ]]; then
-		configureopts="\
---with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix} \
-"
+		configureopts+=("--with-mcrypt=shared${mcrypt_prefix:+","}${mcrypt_prefix}")
 	elif [[ $STACK != "cedar-14" ]]; then
-		configureopts="\
---with-sodium=shared \
-"
+		configureopts+=("--with-sodium=shared")
 	fi
 else
-	configureopts="\
---with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix} \
---with-mysql=shared \
-"
+	configureopts+=("--with-mcrypt${mcrypt_prefix:+"="}${mcrypt_prefix}" "--with-mysql=shared")
 fi
 
 export PATH=${OUT_PREFIX}/bin:$PATH
@@ -164,7 +156,7 @@ export PATH=${OUT_PREFIX}/bin:$PATH
 	--with-pdo-sqlite=shared \
 	--with-xmlrpc=shared \
 	--with-xsl=shared \
-	$configureopts
+	"${configureopts[@]}"
 make -s -j 9
 make install -s
 rm -rf ${OUT_PREFIX}/opt/imap-2007f # c-client.a got linked statically
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,10 @@ @@
     - ext-blackfire/1.22.0 [David Zuelke]
+    ### FIX
+    - PHP 7 built with --enable-opcache-file only on cedar-14 [David Zuelke]
     ## v137 (2018-06-26)
     ### ADD
@@ Expand Down @@