mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-18 16:28:52 +00:00
php: remove 5.6.40
Lets remove it directly, since October would be a year after EOL so waiting until then would make it quite stale Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
Khem Raj
parent
4efcd85f28
commit
ef93dc3396
@ -1,38 +0,0 @@
|
||||
From ed0a954983d50267c2fc0bc13aba929ea0cad971 Mon Sep 17 00:00:00 2001
|
||||
From: Dengke Du <dengke.du@windriver.com>
|
||||
Date: Tue, 2 May 2017 06:34:40 +0000
|
||||
Subject: [PATCH] Add -lpthread to link
|
||||
|
||||
When building the php-5.6.26, the following errors occured:
|
||||
|
||||
ld: TSRM/.libs/TSRM.o: undefined reference to symbol
|
||||
'pthread_sigmask@@GLIBC_2.2.5'
|
||||
|
||||
error adding symbols: DSO missing from command line
|
||||
|
||||
This is because no pthread to link, so we should add it.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Dengke Du <dengke.du@windriver.com>
|
||||
---
|
||||
configure.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index a467dff1..9afef652 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1058,7 +1058,8 @@ case $php_sapi_module in
|
||||
;;
|
||||
esac
|
||||
|
||||
-EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
|
||||
+PTHREAD_LIBS="-lpthread"
|
||||
+EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS $PTHREAD_LIBS"
|
||||
|
||||
dnl this has to be here to prevent the openssl crypt() from
|
||||
dnl overriding the system provided crypt().
|
||||
--
|
||||
2.11.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,90 +0,0 @@
|
||||
From 003c9feaae6ed5c173edcea51193e49bc94ac39a Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen.kooi@linaro.org>
|
||||
Date: Tue, 17 Jun 2014 09:53:00 +0200
|
||||
Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config
|
||||
|
||||
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
acinclude.m4 | 63 ++++++++++++++++++++++--------------------------------------
|
||||
1 file changed, 23 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 206fcbf..a6c0d84 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -2530,48 +2530,31 @@ dnl
|
||||
dnl Common setup macro for libxml
|
||||
dnl
|
||||
AC_DEFUN([PHP_SETUP_LIBXML], [
|
||||
-AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
|
||||
-[
|
||||
-
|
||||
- ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
|
||||
-
|
||||
+PKG_CHECK_MODULES([LIBXML], [libxml-2.0 > 2.6.11], [
|
||||
+ PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
|
||||
+ PHP_EVAL_INCLINE($LIBXML_CFLAGS)
|
||||
+
|
||||
+ dnl Check that build works with given libs
|
||||
+ AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [
|
||||
+ PHP_TEST_BUILD(xmlInitParser,
|
||||
+ [
|
||||
+ php_cv_libxml_build_works=yes
|
||||
+ AC_MSG_RESULT(yes)
|
||||
+ ], [
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ AC_MSG_ERROR([build test failed. Please check the config.log for details.])
|
||||
+ ], [
|
||||
+ [$]$1
|
||||
+ ])
|
||||
+ ])
|
||||
+ if test "$php_cv_libxml_build_works" = "yes"; then
|
||||
+ AC_DEFINE(HAVE_LIBXML, 1, [ ])
|
||||
+ fi
|
||||
+ $2
|
||||
+], [
|
||||
+ AC_MSG_ERROR([$LIBXML_PKG_ERRORS])
|
||||
])
|
||||
|
||||
- if test -x "$ac_cv_php_xml2_config_path"; then
|
||||
- XML2_CONFIG="$ac_cv_php_xml2_config_path"
|
||||
- libxml_full_version=`$XML2_CONFIG --version`
|
||||
- ac_IFS=$IFS
|
||||
- IFS="."
|
||||
- set $libxml_full_version
|
||||
- IFS=$ac_IFS
|
||||
- LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
|
||||
- if test "$LIBXML_VERSION" -ge "2006011"; then
|
||||
- LIBXML_LIBS=`$XML2_CONFIG --libs`
|
||||
- LIBXML_INCS=`$XML2_CONFIG --cflags`
|
||||
- PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
|
||||
- PHP_EVAL_INCLINE($LIBXML_INCS)
|
||||
-
|
||||
- dnl Check that build works with given libs
|
||||
- AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [
|
||||
- PHP_TEST_BUILD(xmlInitParser,
|
||||
- [
|
||||
- php_cv_libxml_build_works=yes
|
||||
- ], [
|
||||
- AC_MSG_RESULT(no)
|
||||
- AC_MSG_ERROR([build test failed. Please check the config.log for details.])
|
||||
- ], [
|
||||
- [$]$1
|
||||
- ])
|
||||
- ])
|
||||
- if test "$php_cv_libxml_build_works" = "yes"; then
|
||||
- AC_DEFINE(HAVE_LIBXML, 1, [ ])
|
||||
- fi
|
||||
- $2
|
||||
- else
|
||||
- AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
|
||||
- fi
|
||||
-ifelse([$3],[],,[else $3])
|
||||
- fi
|
||||
])
|
||||
|
||||
dnl -------------------------------------------------------------------------
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 4fd452e..206fcbf 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -2532,12 +2532,9 @@ dnl
|
||||
AC_DEFUN([PHP_SETUP_LIBXML], [
|
||||
AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
|
||||
[
|
||||
- for i in $PHP_LIBXML_DIR /usr/local /usr; do
|
||||
- if test -x "$i/bin/xml2-config"; then
|
||||
- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
+
|
||||
+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
|
||||
+
|
||||
])
|
||||
|
||||
if test -x "$ac_cv_php_xml2_config_path"; then
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
From 1fb5a3b3e6c9cf0002ff76988de72f011b642005 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 12 Feb 2019 16:25:37 +0800
|
||||
Subject: [PATCH] acinclude.m4: don't unset cache variables
|
||||
|
||||
Unsetting prevents cache variable from being passed to configure.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-specific]
|
||||
|
||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
||||
|
||||
update patch to version 5.6.40
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
acinclude.m4 | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index b188eee..ed32fc5 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -1897,8 +1897,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
|
||||
dnl
|
||||
AC_DEFUN([PHP_CHECK_FUNC_LIB],[
|
||||
ifelse($2,,:,[
|
||||
- unset ac_cv_lib_$2[]_$1
|
||||
- unset ac_cv_lib_$2[]___$1
|
||||
unset found
|
||||
AC_CHECK_LIB($2, $1, [found=yes], [
|
||||
AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
|
||||
@@ -1930,8 +1928,6 @@ dnl in the default libraries and as a fall back in the specified library.
|
||||
dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
|
||||
dnl
|
||||
AC_DEFUN([PHP_CHECK_FUNC],[
|
||||
- unset ac_cv_func_$1
|
||||
- unset ac_cv_func___$1
|
||||
unset found
|
||||
|
||||
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,387 +0,0 @@
|
||||
From fafcfac0933c17e1bf551600080eb0541186caf5 Mon Sep 17 00:00:00 2001
|
||||
From: Anuj Mittal <anuj.mittal@intel.com>
|
||||
Date: Mon, 2 Apr 2018 17:54:52 +0800
|
||||
Subject: [PATCH] opcache/config.m4: enable opcache
|
||||
|
||||
We can't use AC_TRY_RUN to run programs in a cross compile environment. Set
|
||||
the variables directly instead since we know that we'd be running on latest
|
||||
enough linux kernel.
|
||||
|
||||
Upstream-Status: Inappropriate [Configuration]
|
||||
|
||||
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
||||
|
||||
%% original patch: php5-0001-opcache-config.m4-enable-opcache.patch
|
||||
---
|
||||
ext/opcache/config.m4 | 349 ++------------------------------------------------
|
||||
1 file changed, 8 insertions(+), 341 deletions(-)
|
||||
|
||||
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
|
||||
index 5a8b86c..6e87fa5 100644
|
||||
--- a/ext/opcache/config.m4
|
||||
+++ b/ext/opcache/config.m4
|
||||
@@ -11,353 +11,20 @@ if test "$PHP_OPCACHE" != "no"; then
|
||||
AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function])
|
||||
])
|
||||
|
||||
- AC_MSG_CHECKING(for sysvipc shared memory support)
|
||||
- AC_TRY_RUN([
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/wait.h>
|
||||
-#include <sys/ipc.h>
|
||||
-#include <sys/shm.h>
|
||||
-#include <unistd.h>
|
||||
-#include <string.h>
|
||||
+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
|
||||
|
||||
-int main() {
|
||||
- pid_t pid;
|
||||
- int status;
|
||||
- int ipc_id;
|
||||
- char *shm;
|
||||
- struct shmid_ds shmbuf;
|
||||
+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
|
||||
|
||||
- ipc_id = shmget(IPC_PRIVATE, 4096, (IPC_CREAT | SHM_R | SHM_W));
|
||||
- if (ipc_id == -1) {
|
||||
- return 1;
|
||||
- }
|
||||
+ AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support])
|
||||
|
||||
- shm = shmat(ipc_id, NULL, 0);
|
||||
- if (shm == (void *)-1) {
|
||||
- shmctl(ipc_id, IPC_RMID, NULL);
|
||||
- return 2;
|
||||
- }
|
||||
-
|
||||
- if (shmctl(ipc_id, IPC_STAT, &shmbuf) != 0) {
|
||||
- shmdt(shm);
|
||||
- shmctl(ipc_id, IPC_RMID, NULL);
|
||||
- return 3;
|
||||
- }
|
||||
-
|
||||
- shmbuf.shm_perm.uid = getuid();
|
||||
- shmbuf.shm_perm.gid = getgid();
|
||||
- shmbuf.shm_perm.mode = 0600;
|
||||
-
|
||||
- if (shmctl(ipc_id, IPC_SET, &shmbuf) != 0) {
|
||||
- shmdt(shm);
|
||||
- shmctl(ipc_id, IPC_RMID, NULL);
|
||||
- return 4;
|
||||
- }
|
||||
-
|
||||
- shmctl(ipc_id, IPC_RMID, NULL);
|
||||
-
|
||||
- strcpy(shm, "hello");
|
||||
-
|
||||
- pid = fork();
|
||||
- if (pid < 0) {
|
||||
- return 5;
|
||||
- } else if (pid == 0) {
|
||||
- strcpy(shm, "bye");
|
||||
- return 6;
|
||||
- }
|
||||
- if (wait(&status) != pid) {
|
||||
- return 7;
|
||||
- }
|
||||
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
|
||||
- return 8;
|
||||
- }
|
||||
- if (strcmp(shm, "bye") != 0) {
|
||||
- return 9;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-],dnl
|
||||
- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
|
||||
- msg=yes,msg=no,msg=no)
|
||||
- AC_MSG_RESULT([$msg])
|
||||
-
|
||||
- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
|
||||
- AC_TRY_RUN([
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/wait.h>
|
||||
-#include <sys/mman.h>
|
||||
-#include <unistd.h>
|
||||
-#include <string.h>
|
||||
-
|
||||
-#ifndef MAP_ANON
|
||||
-# ifdef MAP_ANONYMOUS
|
||||
-# define MAP_ANON MAP_ANONYMOUS
|
||||
-# endif
|
||||
-#endif
|
||||
-#ifndef MAP_FAILED
|
||||
-# define MAP_FAILED ((void*)-1)
|
||||
-#endif
|
||||
-
|
||||
-int main() {
|
||||
- pid_t pid;
|
||||
- int status;
|
||||
- char *shm;
|
||||
-
|
||||
- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
|
||||
- if (shm == MAP_FAILED) {
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- strcpy(shm, "hello");
|
||||
-
|
||||
- pid = fork();
|
||||
- if (pid < 0) {
|
||||
- return 5;
|
||||
- } else if (pid == 0) {
|
||||
- strcpy(shm, "bye");
|
||||
- return 6;
|
||||
- }
|
||||
- if (wait(&status) != pid) {
|
||||
- return 7;
|
||||
- }
|
||||
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
|
||||
- return 8;
|
||||
- }
|
||||
- if (strcmp(shm, "bye") != 0) {
|
||||
- return 9;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-],dnl
|
||||
- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
|
||||
- msg=yes,msg=no,msg=no)
|
||||
- AC_MSG_RESULT([$msg])
|
||||
-
|
||||
- AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support)
|
||||
- AC_TRY_RUN([
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/wait.h>
|
||||
-#include <sys/mman.h>
|
||||
-#include <sys/stat.h>
|
||||
-#include <fcntl.h>
|
||||
-#include <unistd.h>
|
||||
-#include <string.h>
|
||||
-
|
||||
-#ifndef MAP_FAILED
|
||||
-# define MAP_FAILED ((void*)-1)
|
||||
-#endif
|
||||
-
|
||||
-int main() {
|
||||
- pid_t pid;
|
||||
- int status;
|
||||
- int fd;
|
||||
- char *shm;
|
||||
-
|
||||
- fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
|
||||
- if (fd == -1) {
|
||||
- return 1;
|
||||
- }
|
||||
-
|
||||
- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
- if (shm == MAP_FAILED) {
|
||||
- return 2;
|
||||
- }
|
||||
-
|
||||
- strcpy(shm, "hello");
|
||||
-
|
||||
- pid = fork();
|
||||
- if (pid < 0) {
|
||||
- return 5;
|
||||
- } else if (pid == 0) {
|
||||
- strcpy(shm, "bye");
|
||||
- return 6;
|
||||
- }
|
||||
- if (wait(&status) != pid) {
|
||||
- return 7;
|
||||
- }
|
||||
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
|
||||
- return 8;
|
||||
- }
|
||||
- if (strcmp(shm, "bye") != 0) {
|
||||
- return 9;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-],dnl
|
||||
- AC_DEFINE(HAVE_SHM_MMAP_ZERO, 1, [Define if you have mmap("/dev/zero") SHM support])
|
||||
- msg=yes,msg=no,msg=no)
|
||||
- AC_MSG_RESULT([$msg])
|
||||
-
|
||||
- AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
|
||||
- AC_TRY_RUN([
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/wait.h>
|
||||
-#include <sys/mman.h>
|
||||
-#include <sys/stat.h>
|
||||
-#include <fcntl.h>
|
||||
-#include <unistd.h>
|
||||
-#include <string.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <stdio.h>
|
||||
-
|
||||
-#ifndef MAP_FAILED
|
||||
-# define MAP_FAILED ((void*)-1)
|
||||
-#endif
|
||||
-
|
||||
-int main() {
|
||||
- pid_t pid;
|
||||
- int status;
|
||||
- int fd;
|
||||
- char *shm;
|
||||
- char tmpname[4096];
|
||||
-
|
||||
- sprintf(tmpname,"test.shm.%dXXXXXX", getpid());
|
||||
- if (mktemp(tmpname) == NULL) {
|
||||
- return 1;
|
||||
- }
|
||||
- fd = shm_open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
|
||||
- if (fd == -1) {
|
||||
- return 2;
|
||||
- }
|
||||
- if (ftruncate(fd, 4096) < 0) {
|
||||
- close(fd);
|
||||
- shm_unlink(tmpname);
|
||||
- return 3;
|
||||
- }
|
||||
-
|
||||
- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
- if (shm == MAP_FAILED) {
|
||||
- return 4;
|
||||
- }
|
||||
- shm_unlink(tmpname);
|
||||
- close(fd);
|
||||
-
|
||||
- strcpy(shm, "hello");
|
||||
-
|
||||
- pid = fork();
|
||||
- if (pid < 0) {
|
||||
- return 5;
|
||||
- } else if (pid == 0) {
|
||||
- strcpy(shm, "bye");
|
||||
- return 6;
|
||||
- }
|
||||
- if (wait(&status) != pid) {
|
||||
- return 7;
|
||||
- }
|
||||
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
|
||||
- return 8;
|
||||
- }
|
||||
- if (strcmp(shm, "bye") != 0) {
|
||||
- return 9;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-],dnl
|
||||
- AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
|
||||
- msg=yes,msg=no,msg=no)
|
||||
- AC_MSG_RESULT([$msg])
|
||||
+ AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
|
||||
|
||||
AC_MSG_CHECKING(for mmap() using regular file shared memory support)
|
||||
- AC_TRY_RUN([
|
||||
-#include <sys/types.h>
|
||||
-#include <sys/wait.h>
|
||||
-#include <sys/mman.h>
|
||||
-#include <sys/stat.h>
|
||||
-#include <fcntl.h>
|
||||
-#include <unistd.h>
|
||||
-#include <string.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <stdio.h>
|
||||
-
|
||||
-#ifndef MAP_FAILED
|
||||
-# define MAP_FAILED ((void*)-1)
|
||||
-#endif
|
||||
-
|
||||
-int main() {
|
||||
- pid_t pid;
|
||||
- int status;
|
||||
- int fd;
|
||||
- char *shm;
|
||||
- char tmpname[4096];
|
||||
-
|
||||
- sprintf(tmpname,"test.shm.%dXXXXXX", getpid());
|
||||
- if (mktemp(tmpname) == NULL) {
|
||||
- return 1;
|
||||
- }
|
||||
- fd = open(tmpname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
|
||||
- if (fd == -1) {
|
||||
- return 2;
|
||||
- }
|
||||
- if (ftruncate(fd, 4096) < 0) {
|
||||
- close(fd);
|
||||
- unlink(tmpname);
|
||||
- return 3;
|
||||
- }
|
||||
-
|
||||
- shm = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
- if (shm == MAP_FAILED) {
|
||||
- return 4;
|
||||
- }
|
||||
- unlink(tmpname);
|
||||
- close(fd);
|
||||
-
|
||||
- strcpy(shm, "hello");
|
||||
-
|
||||
- pid = fork();
|
||||
- if (pid < 0) {
|
||||
- return 5;
|
||||
- } else if (pid == 0) {
|
||||
- strcpy(shm, "bye");
|
||||
- return 6;
|
||||
- }
|
||||
- if (wait(&status) != pid) {
|
||||
- return 7;
|
||||
- }
|
||||
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 6) {
|
||||
- return 8;
|
||||
- }
|
||||
- if (strcmp(shm, "bye") != 0) {
|
||||
- return 9;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-],dnl
|
||||
- AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
|
||||
- msg=yes,msg=no,msg=no)
|
||||
- AC_MSG_RESULT([$msg])
|
||||
-
|
||||
-flock_type=unknown
|
||||
-AC_MSG_CHECKING("whether flock struct is linux ordered")
|
||||
-AC_TRY_RUN([
|
||||
- #include <fcntl.h>
|
||||
- struct flock lock = { 1, 2, 3, 4, 5 };
|
||||
- int main() {
|
||||
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
|
||||
- return 0;
|
||||
- }
|
||||
- return 1;
|
||||
- }
|
||||
-], [
|
||||
- flock_type=linux
|
||||
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
||||
- AC_MSG_RESULT("yes")
|
||||
-], AC_MSG_RESULT("no") )
|
||||
+
|
||||
+ AC_DEFINE(HAVE_SHM_MMAP_FILE, 1, [Define if you have mmap() SHM support])
|
||||
|
||||
-AC_MSG_CHECKING("whether flock struct is BSD ordered")
|
||||
-AC_TRY_RUN([
|
||||
- #include <fcntl.h>
|
||||
- struct flock lock = { 1, 2, 3, 4, 5 };
|
||||
- int main() {
|
||||
- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
|
||||
- return 0;
|
||||
- }
|
||||
- return 1;
|
||||
- }
|
||||
-], [
|
||||
- flock_type=bsd
|
||||
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
||||
- AC_MSG_RESULT("yes")
|
||||
-], AC_MSG_RESULT("no") )
|
||||
+ flock_type=linux
|
||||
+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
||||
|
||||
if test "$flock_type" = "unknown"; then
|
||||
AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
From 5f49987e88dfcbdb84be6e0c9025432fbd998709 Mon Sep 17 00:00:00 2001
|
||||
From: Roy Li <rongqing.li@windriver.com>
|
||||
Date: Thu, 20 Aug 2015 16:29:35 +0800
|
||||
Subject: [PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
AC_TRY_RUN is not suitable for cross-compile
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
|
||||
%% original patch: change-AC_TRY_RUN-to-AC_TRY_LINK.patch
|
||||
|
||||
%% original patch: php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
|
||||
---
|
||||
ext/fileinfo/config.m4 | 31 ++++++-------------------------
|
||||
1 file changed, 6 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
|
||||
index 7e98d62..8a8ea0e 100644
|
||||
--- a/ext/fileinfo/config.m4
|
||||
+++ b/ext/fileinfo/config.m4
|
||||
@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
|
||||
libmagic/readcdf.c libmagic/softmagic.c"
|
||||
|
||||
AC_MSG_CHECKING([for strcasestr])
|
||||
- AC_TRY_RUN([
|
||||
-#include <string.h>
|
||||
-#include <strings.h>
|
||||
-#include <stdlib.h>
|
||||
-
|
||||
-int main(void)
|
||||
-{
|
||||
- char *s0, *s1, *ret;
|
||||
-
|
||||
- s0 = (char *) malloc(42);
|
||||
- s1 = (char *) malloc(8);
|
||||
-
|
||||
- memset(s0, 'X', 42);
|
||||
- s0[24] = 'Y';
|
||||
- s0[26] = 'Z';
|
||||
- s0[41] = '\0';
|
||||
- memset(s1, 'x', 8);
|
||||
- s1[0] = 'y';
|
||||
- s1[2] = 'Z';
|
||||
- s1[7] = '\0';
|
||||
-
|
||||
- ret = strcasestr(s0, s1);
|
||||
-
|
||||
- return !(NULL != ret);
|
||||
-}
|
||||
+ AC_TRY_COMPILE([
|
||||
+ #include <string.h>
|
||||
+ #include <strings.h>
|
||||
+ #include <stdlib.h>
|
||||
+ ],[
|
||||
+ strcasestr(NULL, NULL);
|
||||
],[
|
||||
dnl using the platform implementation
|
||||
AC_MSG_RESULT(yes)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 2 Nov 2011 16:54:57 +0100
|
||||
Subject: [PATCH] Upstream-Status: Pending
|
||||
|
||||
%% original patch: php5-pear-makefile.patch
|
||||
---
|
||||
pear/Makefile.frag | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
|
||||
index 00bacae..739eeca 100644
|
||||
--- a/pear/Makefile.frag
|
||||
+++ b/pear/Makefile.frag
|
||||
@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix}
|
||||
PEAR_SUFFIX = -ds a$(program_suffix)
|
||||
|
||||
install-pear-installer: $(SAPI_CLI_PATH)
|
||||
- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
|
||||
+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
|
||||
|
||||
install-pear:
|
||||
@echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 3ea626a8d081f56b01004b7992534d4e6b81a9cc Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Wed, 2 Nov 2011 16:54:57 +0100
|
||||
Subject: [PATCH] Fix phar packaging
|
||||
|
||||
Inherited from OE-Classic, with some additions to fix host paths leaking
|
||||
into the target package.
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
%% original patch: php5-phar-makefile.patch
|
||||
---
|
||||
ext/phar/Makefile.frag | 17 +++--------------
|
||||
1 file changed, 3 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
|
||||
index b8b1b42..1005b2d 100644
|
||||
--- a/ext/phar/Makefile.frag
|
||||
+++ b/ext/phar/Makefile.frag
|
||||
@@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
|
||||
|
||||
PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
|
||||
PHP_PHARCMD_EXECUTABLE = ` \
|
||||
- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
|
||||
- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
|
||||
- if test "x$(PHP_MODULES)" != "x"; then \
|
||||
- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
|
||||
- for i in bz2 zlib phar; do \
|
||||
- if test -f "$(top_builddir)/modules/$$i.la"; then \
|
||||
- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
|
||||
- fi; \
|
||||
- done; \
|
||||
- fi; \
|
||||
- else \
|
||||
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
|
||||
- fi;`
|
||||
-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
||||
+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
|
||||
+
|
||||
+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
||||
|
||||
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|
||||
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Mon, 8 Apr 2013 14:29:51 +0800
|
||||
Subject: [PATCH] pthread-check
|
||||
|
||||
Enable pthreads support when cross-compiling
|
||||
|
||||
Upstream-Status: Inapproprate [config]
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
---
|
||||
TSRM/threads.m4 | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4
|
||||
index 38494ce..15d9454 100644
|
||||
--- a/TSRM/threads.m4
|
||||
+++ b/TSRM/threads.m4
|
||||
@@ -86,7 +86,7 @@ int main() {
|
||||
pthreads_working=no
|
||||
], [
|
||||
dnl For cross compiling running this test is of no use. NetWare supports pthreads
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
--
|
||||
1.7.4.1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
require php.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4"
|
||||
|
||||
SRC_URI += "file://php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
|
||||
file://pthread-check-threads-m4.patch \
|
||||
file://0001-Add-lpthread-to-link.patch \
|
||||
file://acinclude-xml2-config.patch \
|
||||
file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \
|
||||
file://0001-PHP-5.6-LibSSL-1.1-compatibility.patch \
|
||||
file://php5-0001-acinclude.m4-don-t-unset-cache-variables.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_class-target = " \
|
||||
file://php5-pear-makefile.patch \
|
||||
file://php5-phar-makefile.patch \
|
||||
file://php5-0001-opcache-config.m4-enable-opcache.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "44633604d2fece1f53f508bc16751b74"
|
||||
SRC_URI[sha256sum] = "ffd025d34623553ab2f7fd8fb21d0c9e6f9fa30dc565ca03a1d7b763023fba00"
|
||||
|
||||
DEPENDS += "libmcrypt"
|
||||
EXTRA_OECONF += "--with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
|
||||
"
|
||||
Loading…
x
Reference in New Issue
Block a user