Commit:    793e67a7c77c8123d6857b2c5fd958f5194ae3fb
Author:    Christoph M. Becker <[email protected]>         Tue, 7 May 2019 
23:40:07 +0200
Parents:   d61247dc16e5915d42aec2862ef33fcfbf5f4c95
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=793e67a7c77c8123d6857b2c5fd958f5194ae3fb

Log:
Remove build-breaking --without-interbase

ext/interbase has been removed, so configuring --without-interbase
broke the build.

Changed paths:
  M  data/config/branch/x64/phpmaster.ini
  M  data/config/branch/x86/phpmaster.ini


Diff:
diff --git a/data/config/branch/x64/phpmaster.ini 
b/data/config/branch/x64/phpmaster.ini
index 030ff1e..ce19125 100644
--- a/data/config/branch/x64/phpmaster.ini
+++ b/data/config/branch/x64/phpmaster.ini
@@ -15,20 +15,20 @@ arch=x64
 name=nts-windows-vc15-x64
 compiler=vc15
 arch=x64
-configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-interbase --without-analyzer
+configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
 [build-ts-windows-vc15-x64]
 name=ts-windows-vc15-x64
 compiler=vc15
 arch=x64
-configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-interbase --without-analyzer
+configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
 [build-nts-windows-vc15-x64-avx]
 name=nts-windows-vc15-x64
 compiler=vc15
 arch=x64
-configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-interbase --without-analyzer 
--enable-native-intrinsics=avx
+configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 
--with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared
 --enable-com-dotnet=shared --without-analyzer --enable-native-intrinsics=avx
 platform=windows
 
diff --git a/data/config/branch/x86/phpmaster.ini 
b/data/config/branch/x86/phpmaster.ini
index 4e668b1..24176d7 100644
--- a/data/config/branch/x86/phpmaster.ini
+++ b/data/config/branch/x86/phpmaster.ini
@@ -15,12 +15,12 @@ arch=x86
 name=nts-windows-vc15-x86
 compiler=vc15
 arch=x86
-configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-interbase --without-analyzer
+configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows
 
 [build-ts-windows-vc15-x86]
 name=ts-windows-vc15-x86
 compiler=vc15
 arch=x86
-configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-interbase --without-analyzer
+configure_options=--enable-snapshot-build --enable-debug-pack 
--with-pdo-oci=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 
--with-oci8-12c=c:\php-snap-build\deps_aux\oracle\x86\instantclient_12_1\sdk,shared
 --enable-com-dotnet=shared --without-analyzer
 platform=windows


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to