mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
103,129 Commits 500 Branches 1,381 Tags 811 MiB
8126599670
Commit Graph

500 Commits

Author SHA1 Message Date
Christopher Jones
2251e4369a Merge branch 'PHP-5.5' 
* PHP-5.5:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
 2013-08-16 10:57:55 -07:00
Christopher Jones
4b4ffaf703 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
 2013-08-16 10:49:05 -07:00
Christopher Jones
0ebef462ce With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and 
Linux are now used.  DTrace is part of Oracle Linux.  See
https://oss.oracle.com/projects/DTrace/

This patch does not change DTrace linking for non-Solaris/Linux
platforms.

For SystemTap users on Linux, this patch removes the compilation
warning:
  Warning: Linking the shared library libphp5.la against the
  non-libtool objects Zend/zend_dtrace.d.o is not portable!
 2013-08-16 10:40:50 -07:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Christopher Jones
ca0497bba2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
 2013-08-05 15:46:54 -07:00
Christopher Jones
18f17818a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
 2013-08-05 15:40:56 -07:00
Christopher Jones
47d66a0b4e NEWS for recent DTrace merges. 
Remove redundant 'cp' during DTrace install.
 2013-08-05 15:38:36 -07:00
Christopher Jones
3bbe5931bc Fixed bug #62691 (solaris sed has no -i switch) 
Make 'make distclean' remove generated DTrace .h file
 2013-08-05 15:18:12 -07:00
David Soria Parra
a5c524f1be Enable dtrace probes on linux as they are compatible with systemtap 
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
 2013-08-05 15:07:04 -07:00
Remi Collet
3c5e229212 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2013-08-05 14:52:12 -07:00
Christopher Jones
8fdf1ad32d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'
 2013-08-05 14:28:24 -07:00
Christopher Jones
b90b551228 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
	ext/mysqlnd/mysqlnd.c
 2013-08-05 14:27:54 -07:00
Christopher Jones
ec4019e8f6 Add an empty make command for DTrace .d files to stop an implicit 
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
 2013-08-05 14:21:06 -07:00
Michael Wallner
a8bc184207 fix generating config.nice 
Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
 2013-08-02 13:15:55 +02:00
Christopher Jones
e3a4b87e89 Fixed bug #62691 (solaris sed has no -i switch) 
Make 'make distclean' remove generated DTrace .h file
 2013-07-31 09:58:28 -07:00
Adam Harvey
296a12efbb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
 2013-06-23 11:04:10 -07:00
Adam Harvey
2531307be6 Fix bug #65088 (Generated configure script is malformed on OpenBSD). 
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.

[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
 2013-06-23 11:02:00 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Remi Collet
201128d39c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
 2013-03-28 10:25:39 +01:00
Remi Collet
640e72ce91 With pkgconfig < 0.28 output is a single space 
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars

Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
 2013-03-28 10:22:20 +01:00
Remi Collet
717b367085 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2012-12-16 08:51:17 +01:00
David Soria Parra
3de00bc615 Enable dtrace probes on linux as they are compatible with systemtap 
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
 2012-12-04 19:36:06 +01:00
Gustavo Lopes
011af74b23 Fix version in check message 2012-08-26 23:12:41 +02:00
Gustavo Lopes
8831b000ca Require ICU >= 4.0 in configure 2012-08-26 19:28:22 +02:00
Moriyoshi Koizumi
43047598c4 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-04-03 02:00:23 +09:00
Moriyoshi Koizumi
a6c95c8a00 Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc. 
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139
Reported by Naohiro Aota.
 2012-04-03 01:51:23 +09:00
Hannes Magnusson
6238cf5a7a Looks like we need to explicity add libstdc++ on recent linux' too, like fedora 14 and ubuntu 11 
This fixes build failures for ext/intl and several pecl exts
 2011-12-27 13:53:11 +00:00
Rasmus Lerdorf
809ece9385 Debian/Ubuntu don't have any special CFLAGS listed here for 
gssapi which shouldn't break the build.
 2011-08-21 22:57:13 +00:00
Rasmus Lerdorf
0bea1fea8f Debian/Ubuntu don't have any special CFLAGS listed here for 
gssapi which shouldn't break the build.
 2011-08-21 22:57:13 +00:00
David Soria Parra
ec0b5ffca9 Fix #55269 (--enable-dtrace fail on FreeBSD) 2011-07-26 23:49:37 +00:00
Scott MacVicar
8e314ae7fc Revert part of the fix for #53339 
On OSX we need ssl AND crypto

The patch that was applied didn't even match what was in the bug
 2011-05-19 05:43:48 +00:00
Scott MacVicar
6fad717299 Revert part of the fix for #53339 
On OSX we need ssl AND crypto

The patch that was applied didn't even match what was in the bug
 2011-05-19 05:43:48 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work 
in autoconf2.13 and we still support that version
in this branch
 2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Christopher Jones
0a4d7e88c9 Fixed bug #54084 (Fix apxs Apache version test to work with Oracle HTTP Server) (Chris Jones) 2011-03-23 18:56:47 +00:00
Christopher Jones
8ca08487b7 Fixed bug #54084 (Fix apxs Apache version test to work with Oracle HTTP Server) (Chris Jones) 2011-03-23 18:56:47 +00:00
Raphael Geissert
a286fa3523 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00
Raphael Geissert
5b55a18622 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 
Patch by Clint Byrum
 2011-03-18 18:47:09 +00:00
Pierre Joye
5a3c4892af - fix build with ICU < 4.2, add ICU_VERSION for m4 checks 2011-02-15 08:28:22 +00:00
Pierre Joye
71f5af6c70 - fix build with ICU < 4.2, add ICU_VERSION for m4 checks 2011-02-15 08:28:03 +00:00
Jani Taskinen
caf792940f - Merged check from trunk to prevent building multiple SAPIs (bug #52419) 2010-11-19 08:26:47 +00:00
Jani Taskinen
15c9da1149 - One more fix for bug #53338 (when copying stuff from other macros, do it all the way.. :) 2010-11-18 16:02:37 +00:00
Jani Taskinen
7c76059c1f - Fixed DTrace support in MacOSX (bug #53338) 2010-11-18 10:11:36 +00:00
Jani Taskinen
c3dd89eeb7 - Fix building SAPI module 2010-11-17 13:01:53 +00:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time) 
# Bug #53271, Bug #52410
 2010-11-13 23:13:07 +00:00
Jani Taskinen
e0858b424a - Using ifelse() here is safer, also eases debugging generated configure. 2010-11-13 22:51:11 +00:00
Jani Taskinen
200dcee22d - Simplified the DTrace configure macros, one is enough 2010-11-13 22:22:51 +00:00
Jani Taskinen
f017a9c93a - WS + cleanup 
# Note:
# Considering DTrace support: Why does it really need any configure time stuff?
# 3 macros for static stuff that could be made much cleaner with simple Makefile.dtrace
# addition. The only thing required in configure is that --enable flag part..
#
 2010-11-13 11:12:07 +00:00
Jani Taskinen
47713462ce - WS 2010-11-13 11:07:38 +00:00
Stanislav Malyshev
33faeb3c19 fix C++ builds on Mac 2010-05-25 01:25:51 +00:00
Antony Dovgal
e68ffa09e0 make the code more readable 2010-05-07 15:17:34 +00:00
David Soria Parra
b5c1e53bc8 Abort with an error message if we cannot create the DTrace header file. 2010-05-07 14:46:27 +00:00
Felipe Pena
d787d545d2 - Fixed bug #51740 (acinclude.m4 macro PHP_CHECK_SIZEOF is not properly quoted) 
Patch by: dave dot mulford at gmail dot com
 2010-05-05 21:55:44 +00:00
Felipe Pena
2b4539fcef - Fixed bug #51740 (acinclude.m4 macro PHP_CHECK_SIZEOF is not properly quoted) 
Patch by: dave dot mulford at gmail dot com
 2010-05-05 21:55:44 +00:00
David Soria Parra
e44d409472 Make sure we search the source dir for the dtrace files 2010-04-30 00:07:39 +00:00
David Soria Parra
08b9fdc8a3 Add DTrace probes 2010-04-24 13:32:30 +00:00
Kalle Sommer Nielsen
62f087df75 Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less cryptic 2010-03-08 15:51:08 +00:00
Moriyoshi Koizumi
8481fd7c3b - Fixed bug #49267 (linking fails for iconv) 2010-03-05 09:12:13 +00:00
Rasmus Lerdorf
937358ebc7 Revert attempt at supporting both autoconf 2.13 and 
modern versions in the same build chain.  There are
simply too many broken things in 2.13 to make it work.
Cache handling is broken as well which is why I need
to revert the pdo_inc_path cache fix as well.

trunk is now 2.60+ only and I'll work on cleaning out
all the legacy cruft from there.
 2009-11-29 06:13:22 +00:00
Rasmus Lerdorf
deec59ab2c Last attempt to get this stuff right before punting it 
and being stuck on 1996 autoconf for eternity
 2009-11-29 03:32:54 +00:00
Rasmus Lerdorf
7cdd773081 More work on the autoconf 2.13->2.60+ transition code. 
2.13 should be working again with one weird libtool issue
left to solve.  It doesn't seem directly related to this
stuff.
 2009-11-28 23:06:54 +00:00
Rasmus Lerdorf
5a2b41a627 Someone strap down Jani and give him a sedative please. 
This makes our toolchain work with the latest versions
of autoconf and avoids a lot of end-user grief.
 2009-11-25 01:30:06 +00:00
Sriram Natarajan
c35177b6a4 - Simplify default flags for Sun C compiler. 2009-08-11 23:45:35 +00:00
Jani Taskinen
558f3861ec MFH:- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) 2009-05-09 20:26:51 +00:00
David Soria Parra
fe8d326d57 Fix test for auto_cflags and explictly set GCC="no" if we detect suncc 2008-12-03 19:53:45 +00:00
David Soria Parra
47e909faed MFH: Detect Sun C compiler and set default flags if it is used 2008-11-06 20:42:11 +00:00
Antony Dovgal
4126e2d8f1 add missing file 2008-09-08 10:24:25 +00:00
Antony Dovgal
91ca9b7d53 MFH: set GCC to "no" if ICC was detected 2008-07-24 14:17:54 +00:00
Jani Taskinen
0f9e2b1753 MFH: sync acinclude.m4 (leave the PHP_PROG_LEX for BC!) 2008-07-21 10:31:37 +00:00
Antony Dovgal
856c19c67c make --enable-zend-multibyte known to configure 2008-07-03 07:46:17 +00:00
Derick Rethans
0fe9a18758 - Reset back to 0.13.4 now that it released. 2008-04-07 17:55:21 +00:00
Derick Rethans
2facb4e240 - Don't rely on a version that doesn't exist - that breaks snapshots. 2008-03-31 10:08:57 +00:00
Marcus Boerger
0893c3e2c9 - Another re2c version bump and scanner regeneration 
# It appears no one has used re2c in the way we do
 2008-03-22 17:59:52 +00:00
Marcus Boerger
a9b9062980 - Require 0.13.3 2008-03-22 15:39:53 +00:00
Marcus Boerger
af316021e8 - Rewrite scanner to be based on re2c instead of flex 
The full patch is available as:
  http://php.net/~helly/php-re2c-5.3-20080316.diff.txt
  This is against php-re2c repository version 98
  An older patch against version 97 is available under:
  http://php.net/~helly/php-re2c-97-20080316.diff.txt
 2008-03-16 21:06:55 +00:00
Marcus Boerger
2633dcab46 - MFH Allow zend_extensions to be build inside ext and tested with 'make test' 2008-02-17 20:50:03 +00:00
Jani Taskinen
c6a7e4cad4 MFH:- Part 1 of fixing problems with runpath switch (make --disable-rpath work for real) 2007-08-20 14:28:45 +00:00
Jani Taskinen
82559ff7e5 - Hopefully this fixes the "test: argument expected" error on solaris.. 2007-08-03 10:45:23 +00:00
Jani Taskinen
8684e7495f MFH: - Made build system less major version dependant to ease MFB/MFH 2007-07-26 22:45:59 +00:00
Jani Taskinen
5a1c39f71d MFH: - Allow using extra headers in PHP_CHECK_SIZEOF 2007-07-25 22:49:39 +00:00
Jani Taskinen
a547182c79 MFH:- Stop configure if scanner files are not found and invalid/no flex is found 2007-07-19 12:36:06 +00:00
Jani Taskinen
76b92b6d5d - Fix issue in differentiating between --with-* and --enable-* 2007-07-16 10:00:44 +00:00
Johannes Schlüter
dc8d09bbbd - MFH: Always enable mail() function 2007-07-11 17:36:56 +00:00
Jani Taskinen
90b9d6241e - Introducing 1st part of "show unknown configure options" and nuked PHP_REGEX macro for good 2007-07-11 15:16:56 +00:00
Jani Taskinen
b0ef04af84 MFH: Removed --enable-versioning 2007-07-10 10:18:48 +00:00
foobar
4d63c09661 MFH:- Improved php-config: 
MFH:  . Added --configure-options option to get configure line for current build
MFH:  . Added --php-sapis option which shows SAPIs available
MFH:  . Fixed problem with missing php binary when CLI is not build but CGI is.
MFH:- Fixed broken sed issues in phpize script
 2007-06-29 01:10:35 +00:00
foobar
3d88f40d51 MFH:- Added PHP_CHECK_SIZEOF macro (special version of AC_CHECK_SIZEOF) 2007-06-27 14:40:08 +00:00
foobar
efcdcd80b6 - Allow build without flex/bison installed (fixes builddir != srcdir build 
when using distributed sources which inlude pre-generated bison/flex
  output. See bug #38762 for more..)
 2007-05-24 21:40:41 +00:00
foobar
5603bef272 - Fix previous fix. (just revert of Stefan's bad fix..) 2007-05-24 19:52:03 +00:00
foobar
91d98d2986 - Fix idiotic change in logic. (hint: flex is _REQUIRED_ for building PHP! 2007-05-24 19:35:46 +00:00
foobar
f5d9f9cd27 - Check if Makefile.frag actually exists before running sed on it. 2007-03-25 10:21:02 +00:00
Antony Dovgal
43d788ec33 MFH: move PHP_TEST_WRITE_STDOUT to acinclude.m4 and use it in configure.in 2007-02-20 20:11:11 +00:00
Nuno Lopes
f3d0a26e13 add EXTRA_LDFLAGS_PROGRAM to config.nice (as LDFLAG is quite useless) 2007-01-01 20:10:01 +00:00
Antony Dovgal
24b312f8d5 MFH: missing part of the fix for #39795 2006-12-12 12:06:37 +00:00
Antony Dovgal
53f89fad03 MFH 2006-12-12 10:16:06 +00:00
Antony Dovgal
a74c36a335 MFH: fix #39795 (build fails on AIX because crypt_r() uses different data struct) 2006-12-12 07:38:04 +00:00
Antony Dovgal
ebef6661df MFH: fix build with Sun compiler, which doesn't support -O0 2006-12-04 18:28:49 +00:00
Antony Dovgal
b8fc77bd13 MFH: the last part of the fix for #39004 2006-10-02 20:49:23 +00:00