Commit Graph

634 Commits

Author SHA1 Message Date
Anatol Belski
1463115e7e Merge branch 'PHP-5.6'
* PHP-5.6:
  fix timelib build configuration

Conflicts:
	ext/date/config.w32
	ext/date/config0.m4
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 16:26:36 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
35bfa022f9 Merge branch 'PHP-5.6'
* PHP-5.6:
  make timelib_config.h inclusion configurable

Conflicts:
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 13:55:07 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Anatol Belski
fecbb0e7c2 don't error x86 compiler 2015-01-20 20:52:45 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Anatol Belski
2752b409b3 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_versions.txt
  updated libs_versions.txt
  Fix bug #68784
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
2015-01-12 13:00:45 +01:00
Anatol Belski
344a61a613 updated libs_versions.txt 2015-01-12 12:59:59 +01:00
Anatol Belski
7a2dbc0e7c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_versions.txt
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
2015-01-12 12:58:37 +01:00
Anatol Belski
2923f24042 updated libs_versions.txt 2015-01-12 12:58:00 +01:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Kalle Sommer Nielsen
c0b56232ba Be verbose if --with-mp is enabled 2014-12-28 19:40:33 +01:00
Anatol Belski
60d491c970 throw error in configure.js when no 64-bit compiler detected 2014-12-23 14:06:30 +01:00
Anatol Belski
88bb9fedc4 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (111 commits)
  Fix zend_fcall_info_arg*() to use ZVAL_COPY
  Fixed #65213 - cannot cast SplFileInfo to boolean
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
  fix TS build
  add config option to target codegen architectures
  updated NEWS
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation
  Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
  Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
  Fixed __debugInfo() support
  Update UPGRADING for the new variadic functions, and re-sort.
  Improved POST INC/DEC
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
  Missed closed folder mark
  Revert "Unecessary assignment"
  Fixed improper memory release
  Unecessary assignment
  ...
2014-12-05 03:50:02 +01:00
Anatol Belski
00ac1ae53c add config option to target codegen architectures 2014-12-03 19:20:36 +01:00
Anatol Belski
ad1967dec5 add /nologo to ARFLAGS 2014-12-02 10:02:20 +01:00
Anatol Belski
f15463bf39 silence the lib.exe 2014-12-02 09:15:07 +01:00
Anatol Belski
67f1d2ae26 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  updated lib versions
  updated lib versions
2014-11-26 09:51:39 +01:00
Anatol Belski
6e56c13517 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated lib versions
  updated lib versions
2014-11-26 08:35:29 +01:00
Anatol Belski
fe92a811ed updated lib versions 2014-11-26 08:35:00 +01:00
Anatol Belski
1414f2c095 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated lib versions
2014-11-26 08:33:32 +01:00
Anatol Belski
68126a76b4 updated lib versions 2014-11-26 08:33:06 +01:00
Anatol Belski
c6bad96f30 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
2014-11-18 21:18:52 +01:00
Anatol Belski
1ae7743a07 less spaces in the makefile generated commands 2014-11-14 17:39:43 +01:00
Anatol Belski
034a88135f separate LDFLAGS and ARFLAGS to fix the unknown opts warns 2014-11-14 17:39:42 +01:00
Anatol Belski
50825aa879 extend warn list to exclude 2014-11-13 19:57:31 +01:00
Anatol Belski
9b19f516a5 add a configure option to suppress uncritical warns with clang 2014-11-13 11:43:01 +01:00
Anatol Belski
b6c8349be0 pass vc++ version to clang, that will be forwarded to _MSC_VER 2014-11-13 11:20:09 +01:00
Anatol Belski
191fe09e33 HAVE_STRNLEN should be in all toolsets 2014-11-13 10:47:57 +01:00
Anatol Belski
8644f4624c set the vc++ next name 2014-11-13 08:18:40 +01:00
Anatol Belski
4d7a21d0f2 pre create the build dir
otherwise response file generation might fail
2014-11-12 19:06:09 +01:00
Anatol Belski
15f419a635 trim when adding flags, avoid multiple spaces 2014-11-12 17:57:18 +01:00
Anatol Belski
988112a2e1 use response files for exts and sapi linking 2014-11-12 17:57:17 +01:00
Anatol Belski
1acbcdeb27 generate response files for use by linker
Object dir path can under circumstances cause that the expanded
command line exceeds the length allowed by the OS. Linker can read
the object lists from a file which eliminates this issue.
2014-11-12 17:57:17 +01:00
Anatol Belski
79c61c71c2 generalize arch setup 2014-11-12 17:57:16 +01:00
Anatol Belski
524f854193 eliminate duplicated identical function definitions 2014-11-11 18:24:21 +01:00
Anatol Belski
9757d9adbf generalize --with-php-build option handling 2014-11-11 18:24:20 +01:00
Anatol Belski
c0db5cd93d refactor zts related config 2014-11-11 18:24:19 +01:00
Anatol Belski
6d215f8cee fix trailing slash 2014-11-11 00:51:21 +01:00
Anatol Belski
d509e79d70 further fixes to win build
- fixed pdb generation with vs
- made object-out-dir to use an absolute path, that fixes path issues
  with x86/x64 and nmake snap
2014-11-11 00:38:37 +01:00
Anatol Belski
64c081f347 moved libs and debug/release mode setup into functions 2014-11-10 23:30:16 +01:00
Anatol Belski
744fb45217 better description for the toolset config option 2014-11-10 10:58:21 +01:00
Anatol Belski
12cf41ca35 move more common ldflags into function 2014-11-07 19:58:30 +01:00
Anatol Belski
af7e3064f3 rename intel toolset to icc - shorter 2014-11-07 19:24:17 +01:00
Anatol Belski
2e5cba25e8 either ms or intel linker is used, /libpath is supported 2014-11-07 18:39:03 +01:00
Anatol Belski
fc734cf95d further catch up with phpize and improved clang arch setup 2014-11-07 18:33:37 +01:00
Anatol Belski
cfd2b39c18 add /fallback for clang-cl 2014-11-07 14:36:13 +01:00
Anatol Belski
c78c6adbd5 parametrize WINVER and update its value 2014-11-07 14:07:33 +01:00