[meta-oe][PATCH 0/3] php: further clean-ups

[meta-oe][PATCH 0/3] php: further clean-ups

[Jack Mitchell]

From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

Few more PHP clean-up patches, some testing on more esoteric hardware would
be nice, but I don't forsee any problems (famous last words...).

Jack Mitchell (3):
  php: remove obsolete CFLAGS
  php: remove unnecessary LIBS export
  php: remove unneeded THREADS export

 meta-oe/recipes-devtools/php/php.inc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

-- 
1.8.2.2

[meta-oe][PATCH 1/3] php: remove obsolete CFLAGS

[Jack Mitchell]

From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

PTYS_ARE_GETPT and PTYS_ARE_SEARCHED don't appear anywhere in the
source code anymore, remove them.

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 meta-oe/recipes-devtools/php/php.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 749f51c..7ae5cc8 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -57,7 +57,7 @@ THREADS_pn-php = "pthread"
 export THREADS
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
-CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -D_GNU_SOURCE"
+CFLAGS += " -D_GNU_SOURCE"
 
 acpaths = ""
 
-- 
1.8.2.2

[meta-oe][PATCH 2/3] php: remove unnecessary LIBS export

[Jack Mitchell]

From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

Adding explicit LIBS additions is not required anymore

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 meta-oe/recipes-devtools/php/php.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 7ae5cc8..fcd3598 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -50,9 +50,6 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                           , \
                           ,sqlite3"
 
-LIBS_virtclass-native = " -lxml2 "
-LIBS_pn-php =" -lpthread "
-export LIBS
 THREADS_pn-php = "pthread"
 export THREADS
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
-- 
1.8.2.2

[meta-oe][PATCH 3/3] php: remove unneeded THREADS export

[Jack Mitchell]

From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

This is no longer required, as pthreads is the default thread library

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 meta-oe/recipes-devtools/php/php.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index fcd3598..edfdd64 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -50,8 +50,6 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
                           , \
                           ,sqlite3"
 
-THREADS_pn-php = "pthread"
-export THREADS
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
 CFLAGS += " -D_GNU_SOURCE"
-- 
1.8.2.2

Re: [meta-oe][PATCH 0/3] php: further clean-ups

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

On Mon, Apr 29, 2013 at 02:23:39PM +0100, Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> 
> Few more PHP clean-up patches, some testing on more esoteric hardware would
> be nice, but I don't forsee any problems (famous last words...).

Thanks for cleanup patches, are you also using modphp? In last jenkins
builds I've noticed that php and modphp recipes are trying to install
conflicting files in sysroot (and only first one successfully) can you
check if they can be altered to install them correctly or even better,
there was some thread about building cgi and fpm together, what about
building all 4 +cli +modphp in one recipe with few PACKAGECONFIGs?

Cheers,

> 
> Jack Mitchell (3):
>   php: remove obsolete CFLAGS
>   php: remove unnecessary LIBS export
>   php: remove unneeded THREADS export
> 
>  meta-oe/recipes-devtools/php/php.inc | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> -- 
> 1.8.2.2
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe][PATCH 0/3] php: further clean-ups

[Jack Mitchell]

On 29/04/13 14:40, Martin Jansa wrote:
> On Mon, Apr 29, 2013 at 02:23:39PM +0100, Jack Mitchell wrote:
>> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>>
>> Few more PHP clean-up patches, some testing on more esoteric hardware would
>> be nice, but I don't forsee any problems (famous last words...).
> Thanks for cleanup patches, are you also using modphp? In last jenkins
> builds I've noticed that php and modphp recipes are trying to install
> conflicting files in sysroot (and only first one successfully) can you
> check if they can be altered to install them correctly or even better,
> there was some thread about building cgi and fpm together, what about
> building all 4 +cli +modphp in one recipe with few PACKAGECONFIGs?
>
> Cheers,
>
>

I think that would be a fantastic idea, I don't really understand why 
modphp and php are different recipes really.

However, I don't use modphp and I'm not sure I have the skills to merge 
them properly. I will have a look and see if I can do anything.

-- 

   Jack Mitchell (jack@embed.me.uk)
   Embedded Systems Engineer
   http://www.embed.me.uk

--