pmmp/PHP-Binaries
0
0
Fork 0
mirror of https://github.com/pmmp/PHP-Binaries.git synced 2025-04-03 19:05:20 +00:00
Code Issues Activity

fixed windows patch

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-01 12:00:56 +01:00
parent 697956db50
commit 016cf1e2dc
3 changed files with 5 additions and 4 deletions

3
.gitattributes vendored

@ -1,3 +1,4 @@
*.sh text eol=lf
*.bat text eol=crlf
*.ps1 text eol=crlf
*.ps1 text eol=crlf
*.patch binary

4
win32/copy-static-deps.patch

@ -1,8 +1,8 @@
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index b8c6af9d27..4b013fcefe 100644
index f97c49c9..e6853387 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -204,7 +204,8 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
@@ -210,7 +210,8 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
/* the core dll */
copy("$build_dir/php.exe", "$dist_dir/php.exe");

2
windows-compile-vs.bat

@ -49,7 +49,7 @@ cd php-src
REM TODO: remove this (won't be needed as of RC2)
call :pm-echo "Applying mkdist patch..."
git apply "%script_path%\win32\copy-static-deps.patch"
git apply --ignore-space-change --ignore-whitespace "%script_path%\win32\copy-static-deps.patch"
cd ..
call :pm-echo "Getting dependencies..."