From: Anatol Belski <ab@php.net>
Date: Wed, 8 Oct 2014 09:01:15 +0000 (+0200)
Subject: fix phpize for /mp and more
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~77^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a3af83ee2aecff25fd4922ef67c1fb4d2af6201;p=php

fix phpize for /mp and more
---

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 878e48d02b..9b28352c8f 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -151,14 +151,17 @@ if (VCVERS >= 1400) {
 }
 
 ARG_WITH('prefix', 'PHP installation prefix', '');
-ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto');
+ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto');
+var PHP_MP_DISABLED = true;
 if (VCVERS >= 1500 && PHP_MP != 'disable') {
 		// no from disable-all 
 		if(PHP_MP == 'auto' || PHP_MP == 'no') {
 			 ADD_FLAG('CFLAGS', ' /MP ');
+			PHP_MP_DISABLED = false;
 		} else {
 			if(parseInt(PHP_MP) != 0) {
 				ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');
+				PHP_MP_DISABLED = false;
 			} else {
 				STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP);
 			}
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in
index b0ba0bbb82..1302cf7065 100644
--- a/win32/build/phpize.js.in
+++ b/win32/build/phpize.js.in
@@ -213,6 +213,11 @@ C.WriteLine("var MODE_PHPIZE = true;");
 C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
 C.WriteLine("var PHP_PREFIX = " + '"' + PHP_PREFIX.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
 
+/* XXX this needs to be implemented for the phpize mode yet, a quick fix just to disable it for now */
+C.WriteLine("var PHP_ANALYZER = 'disabled';");
+C.WriteLine("var PHP_PGO = 'no';");
+C.WriteLine("var PHP_PGI = 'no';");
+
 C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
 if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {
 	C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));