mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
modphp: revert pthread-check.patch and add one against threads.m4
revert pthread-check.patch which hacks the old configure, instead, add one against threads.m4 to enable pthread support when cross-compiling. Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
This commit is contained in:
parent
d22869df83
commit
12b72e1eaf
|
|
@ -0,0 +1,30 @@
|
|||
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,64 +0,0 @@
|
|||
Hack configure script so it does not disable pthread support when cross-compiling
|
||||
|
||||
Upstream-Status: Inapproprate [config]
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 03d8f95..6794d45 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3506,7 +3506,7 @@ fi
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
@@ -3566,7 +3566,7 @@ else
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
@@ -3636,7 +3636,7 @@ if test "$pthreads_working" != "yes"; then
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
@@ -106833,7 +106833,7 @@ fi
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
@@ -106893,7 +106893,7 @@ else
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
@@ -106963,7 +106963,7 @@ if test "$pthreads_working" != "yes"; then
|
||||
|
||||
if test "$cross_compiling" = yes; then
|
||||
|
||||
- pthreads_working=no
|
||||
+ pthreads_working=yes
|
||||
case $host_alias in
|
||||
*netware*)
|
||||
pthreads_working=yes
|
||||
|
|
@ -5,7 +5,7 @@ DEPENDS = "apache2-native apache2 zlib bzip2"
|
|||
|
||||
SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \
|
||||
file://configure.patch \
|
||||
file://pthread-check.patch \
|
||||
file://pthread-check-threads-m4.patch \
|
||||
file://70_mod_php5.conf \
|
||||
"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user