archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2' into PHP-7.3

Browse source 
* PHP-7.2:
  mkdist.php: recursively check dll dependencies
This commit is contained in:
Anatol Belski 2018-08-23 21:27:43 +02:00
commit f15fc8ea1e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
win32/build/mkdist.php
View file

@ -117,7 +117,11 @@ function get_depends($module)
}
}
$per_module_deps[basename($module)][] = $dep;
if (!isset($per_module_deps[basename($module)]) || !in_array($dep, $per_module_deps[basename($module)])) {
$per_module_deps[basename($module)][] = $dep;
//recursively check dll dependencies
get_depends($dep);
}
}
fclose($pipes[1]);
proc_close($proc);
@ -329,10 +333,6 @@ Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard
deps. For example, libenchant.dll loads libenchant_myspell.dll or
libenchant_ispell.dll
*/
$ICU_DLLS = $php_build_dir . '/bin/icu*.dll';
foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename));
}
$ENCHANT_DLLS = array(
array('', 'glib-2.dll'),
array('', 'gmodule-2.dll'),