diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-08 15:23:03 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-08 15:23:03 +0000 |
commit | d37c8a0152ff714a41a0c3dbfeaadc396150bfe4 (patch) | |
tree | 5328adfcd094a7cfe6012e7fda209c4e515a2d7f /patches | |
parent | 04dbe8ee169dbe64eaed7b00a39299528afb61e2 (diff) | |
download | ptxdist-d37c8a0152ff714a41a0c3dbfeaadc396150bfe4.tar.gz ptxdist-d37c8a0152ff714a41a0c3dbfeaadc396150bfe4.tar.xz |
* generic/php-4.4.4-arm-cross.diff, generic/scripts_add_sysroot.diff, generic/series:
sysroot support for php4-config scirpts
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6774 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r-- | patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff | 12 | ||||
-rw-r--r-- | patches/php-4.4.4/generic/scripts_add_sysroot.diff | 51 | ||||
-rw-r--r-- | patches/php-4.4.4/generic/series | 2 |
3 files changed, 62 insertions, 3 deletions
diff --git a/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff b/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff index 1e9287dd2..24f1eb314 100644 --- a/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff +++ b/patches/php-4.4.4/generic/php-4.4.4-arm-cross.diff @@ -1,6 +1,12 @@ ---- ptxdist/Zend/zend_strtod.c 2005-02-17 05:45:22.000000000 +0100 -+++ ptxdist/Zend/zend_strtod.c 2005-04-08 13:17:49.877528861 +0200 -@@ -129,7 +129,8 @@ +--- + Zend/zend_strtod.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: php-4.4.4/Zend/zend_strtod.c +=================================================================== +--- php-4.4.4.orig/Zend/zend_strtod.c ++++ php-4.4.4/Zend/zend_strtod.c +@@ -129,7 +129,8 @@ typedef unsigned long int uint32_t; * byte and word endianness. The byte order is still little endian * but the word order is big endian. */ diff --git a/patches/php-4.4.4/generic/scripts_add_sysroot.diff b/patches/php-4.4.4/generic/scripts_add_sysroot.diff new file mode 100644 index 000000000..7513dc68b --- /dev/null +++ b/patches/php-4.4.4/generic/scripts_add_sysroot.diff @@ -0,0 +1,51 @@ +# +# Submitted-By: Marc Kleine-Budde, 2007-01-08 +# +# Description: +# +# add sysroot support to pkg-config like scripts +# +--- + scripts/php-config.in | 4 ++-- + scripts/phpize.in | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: php-4.4.4/scripts/php-config.in +=================================================================== +--- php-4.4.4.orig/scripts/php-config.in ++++ php-4.4.4/scripts/php-config.in +@@ -1,8 +1,8 @@ + #! /bin/sh + +-prefix="@prefix@" ++prefix="${SYSROOT}@prefix@" + version="@PHP_VERSION@" +-includedir="@includedir@/php" ++includedir="${SYSROOT}@includedir@/php" + includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" +Index: php-4.4.4/scripts/phpize.in +=================================================================== +--- php-4.4.4.orig/scripts/phpize.in ++++ php-4.4.4/scripts/phpize.in +@@ -3,8 +3,8 @@ + # Variable declaration + prefix='@prefix@' + exec_prefix="`eval echo @exec_prefix@`" +-phpdir="`eval echo @libdir@`/build" +-includedir="`eval echo @includedir@`/php" ++phpdir="${SYSROOT}`eval echo @libdir@`/build" ++includedir="${SYSROOT}`eval echo @includedir@`/php" + builddir="`pwd`" + + FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" +@@ -127,7 +127,7 @@ phpize_copy_files() + phpize_replace_prefix() + { + sed \ +- -e "s#@prefix@#$prefix#" \ ++ -e "s#@prefix@#${SYSROOT}$prefix#" \ + < "$phpdir/phpize.m4" > configure.in + } + diff --git a/patches/php-4.4.4/generic/series b/patches/php-4.4.4/generic/series new file mode 100644 index 000000000..e2e96287a --- /dev/null +++ b/patches/php-4.4.4/generic/series @@ -0,0 +1,2 @@ +php-4.4.4-arm-cross.diff +scripts_add_sysroot.diff |