com web/rmtools: of course, we need all the core deps for pickle builds as well: client/data/config/pickle/pickle53.ini
client/data/config/pickle/pickle54.ini client/data/config/pickle/pickle55.ini client/data/config/pickle/pickle56.ini
client/data/config/pickle/pickle70.ini client/include/PickleExt.php

Commit: ad1e69a7ed591ce01020f25b2642d9720229afc2 Author: Anatol Belski <ab@php.net> Sun, 10 May 2015 01:23:43 +0200 Parents: 7846591b76a38f5e4f2c4768de5baaa69e205602 Branches: master pecl_legacy Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=ad1e69a7ed591ce01020f25b2642d9720229afc2 Log: of course, we need all the core deps for pickle builds as well Changed paths: M client/data/config/pickle/pickle53.ini M client/data/config/pickle/pickle54.ini M client/data/config/pickle/pickle55.ini M client/data/config/pickle/pickle56.ini M client/data/config/pickle/pickle70.ini M client/include/PickleExt.php Diff: diff --git a/client/data/config/pickle/pickle53.ini b/client/data/config/pickle/pickle53.ini index 1180cc3..6fe1ba9 100644 --- a/client/data/config/pickle/pickle53.ini +++ b/client/data/config/pickle/pickle53.ini @@ -13,6 +13,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.3.28-devel-vc9-x86 pecl_deps_base=c:/pecl-dep-libs/vc9/x86 +core_deps_base=C:/php-sdk/php53/vc9/x86/deps [build-ts-windows-vc9-x86] name=ts-windows-vc9-x86 @@ -22,4 +23,5 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.3.28-devel-vc9-x86 pecl_deps_base=c:/pecl-dep-libs/vc9/x86 +core_deps_base=C:/php-sdk/php53/vc9/x86/deps diff --git a/client/data/config/pickle/pickle54.ini b/client/data/config/pickle/pickle54.ini index 515ac7c..38a081f 100644 --- a/client/data/config/pickle/pickle54.ini +++ b/client/data/config/pickle/pickle54.ini @@ -13,6 +13,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.4.40-devel-vc9-x86 pecl_deps_base=c:/pecl-dep-libs/vc9/x86 +core_deps_base=C:/php-sdk/php54/vc9/x86/deps [build-ts-windows-vc9-x86] name=ts-windows-vc9-x86 @@ -22,4 +23,5 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.4.40-devel-vc9-x86 pecl_deps_base=c:/pecl-dep-libs/vc9/x86 +core_deps_base=C:/php-sdk/php54/vc9/x86/deps diff --git a/client/data/config/pickle/pickle55.ini b/client/data/config/pickle/pickle55.ini index 72a976c..1a9c432 100644 --- a/client/data/config/pickle/pickle55.ini +++ b/client/data/config/pickle/pickle55.ini @@ -13,6 +13,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.5.24-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php55/vc11/x86/deps [build-ts-windows-vc11-x86] name=ts-windows-vc11-x86 @@ -22,6 +23,7 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.5.24-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php55/vc11/x86/deps [build-nts-windows-vc11-x64] name=nts-windows-vc11-x64 @@ -31,6 +33,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.5.24-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php55/vc11/x64/deps [build-ts-windows-vc11-x64] name=ts-windows-vc11-x64 @@ -40,4 +43,5 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.5.24-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php55/vc11/x64/deps diff --git a/client/data/config/pickle/pickle56.ini b/client/data/config/pickle/pickle56.ini index 413a883..e4b0d04 100644 --- a/client/data/config/pickle/pickle56.ini +++ b/client/data/config/pickle/pickle56.ini @@ -13,6 +13,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.6.8-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php56/vc11/x86/deps [build-ts-windows-vc11-x86] name=ts-windows-vc11-x86 @@ -22,6 +23,7 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.6.8-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php56/vc11/x86/deps [build-nts-windows-vc11-x64] name=nts-windows-vc11-x64 @@ -31,6 +33,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-5.6.8-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php56/vc11/x64/deps [build-ts-windows-vc11-x64] name=ts-windows-vc11-x64 @@ -40,4 +43,5 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-5.6.8-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php56/vc11/x64/deps diff --git a/client/data/config/pickle/pickle70.ini b/client/data/config/pickle/pickle70.ini index 111f411..18e269b 100644 --- a/client/data/config/pickle/pickle70.ini +++ b/client/data/config/pickle/pickle70..ini @@ -13,6 +13,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-7.0.0-dev-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php70/vc11/x86/deps [build-ts-windows-vc11-x86] name=ts-windows-vc11-x86 @@ -22,6 +23,7 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-7.0.0-dev-devel-VC11-x86 pecl_deps_base=c:/pecl-dep-libs/vc11/x86 +core_deps_base=C:/php-sdk/php70/vc11/x86/deps [build-nts-windows-vc11-x64] name=nts-windows-vc11-x64 @@ -31,6 +33,7 @@ thread_safe=0 platform=windows sdk_path=C:\php-devel\nts\php-7.0.0-dev-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php70/vc11/x64/deps [build-ts-windows-vc11-x64] name=ts-windows-vc11-x64 @@ -40,4 +43,5 @@ thread_safe=1 platform=windows sdk_path=C:\php-devel\ts\php-7.0.0-dev-devel-VC11-x64 pecl_deps_base=c:/pecl-dep-libs/vc11/x64 +core_deps_base=C:/php-sdk/php70/vc11/x64/deps diff --git a/client/include/PickleExt.php b/client/include/PickleExt.php index b17b15d..684b7c4 100644 --- a/client/include/PickleExt.php +++ b/client/include/PickleExt.php @@ -244,10 +244,13 @@ if (!function_exists('rmtools\combinations')) { $ret .= ' "' . $main_opt . '=shared" '; } + /* XXX this defines the core libraries as extra, maybe there's a better way. */ + $extra_lib = array($this->build->core_deps_base . DIRECTORY_SEPARATOR . "lib"); + $extra_inc = array($this->build->core_deps_base . DIRECTORY_SEPARATOR . "include"); + if (isset($data['libs']) && $data['libs']) { $data['libs'] = !is_array($data['libs']) ? array($data['libs']) : $data['libs']; $deps_path = $this->build->pecl_deps_base; - $extra_lib = $extra_inc = array(); foreach($data['libs'] as $lib) { if (!$lib) { @@ -278,15 +281,13 @@ if (!function_exists('rmtools\combinations')) { } } } - - if (!empty($extra_lib)) { - $ret .= ' "--with-extra-libs=' . implode(';', $extra_lib) . '" ' - . ' "--with-extra-includes=' . implode(';', $extra_inc) . '" '; - } } else { $data['libs'] = array(); } + $ret .= ' "--with-extra-libs=' . implode(';', $extra_lib) . '" ' + . ' "--with-extra-includes=' . implode(';', $extra_inc) . '" '; + $this->configure_data = $data; return $ret;