PHP: bump version (#1416)

This commit is contained in:
miqlas
2017-06-14 23:35:23 +02:00
committed by waddlesplash
parent 6185121454
commit 0880d3da8c
3 changed files with 220 additions and 17 deletions

View File

@@ -0,0 +1,46 @@
From a6c749bea2f66db568d9868e302fc030f1ce1980 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 15 Jan 2015 20:35:37 -0500
Subject: [PATCH] php: fixes to work on Haiku.
C code changes by Adrien, build system changes by me.
---
acinclude.m4 | 2 +-
aclocal.m4 | 2 +-
ext/curl/config.m4 | 6 +++---
ext/date/php_date.c | 2 --
ext/gd/config.m4 | 12 ++++++------
ext/standard/microtime.c | 2 +-
ext/zip/config.m4 | 8 ++++----
ext/zlib/config0.m4 | 10 +++++-----
8 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 81dc0db..42dca5e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
if test -z "$php_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
- PHP_ADD_LIBRARY(stdc++)
+ PHP_ADD_LIBRARY(stdc++.r4)
php_cxx_done=yes
fi
])
diff --git a/aclocal.m4 b/aclocal.m4
index 189149f..390dd21 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
if test -z "$php_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
- PHP_ADD_LIBRARY(stdc++)
+ PHP_ADD_LIBRARY(stdc++.r4)
php_cxx_done=yes
fi
])
--
1.8.3.4