1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Commit Graph

450 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