Skip to contentSkip to conversation

php: further clean-ups

PATCH In review Jack Mitchell 2 participants 6 messages Apr 29, 2013

lore
Share & tools
lore
#0 lore raw

cover php: further clean-ups

From: Jack Mitchell <[email protected]>

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(-)
Signature · 1 line
1.8.2.2
#1 lore raw

PATCH 1/3 php: remove obsolete CFLAGS

From: Jack Mitchell <[email protected]>

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

---
 meta-oe/recipes-devtools/php/php.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/php/php.inc +1 -1
index 749f51c..7ae5cc8 100644
@@ -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 = ""
 
Signature · 1 line
1.8.2.2
#2 lore raw

PATCH 2/3 php: remove unnecessary LIBS export

In reply to Jack Mitchell

From: Jack Mitchell <[email protected]>

Adding explicit LIBS additions is not required anymore

---
 meta-oe/recipes-devtools/php/php.inc | 3 ---
 1 file changed, 3 deletions(-)
meta-oe/recipes-devtools/php/php.inc +0 -3
index 7ae5cc8..fcd3598 100644
@@ -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}"
Signature · 1 line
1.8.2.2
#3 lore raw

PATCH 3/3 php: remove unneeded THREADS export

In reply to Jack Mitchell

From: Jack Mitchell <[email protected]>

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

---
 meta-oe/recipes-devtools/php/php.inc | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-devtools/php/php.inc +0 -2
index fcd3598..edfdd64 100644
@@ -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"
Signature · 1 line
1.8.2.2
#4 lore raw
In reply to Jack Mitchell
Quoted 4 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

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,

Quoted 17 lines

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(-)
Signature · 7 lines
1.8.2.2


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#5 lore raw
Quoted 5 lines · Martin Jansa
Quoted 4 lines · Jack Mitchell

From: Jack Mitchell <[email protected]>

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...).

Quoted 10 lines

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.

Signature · 5 lines
  Jack Mitchell ([email protected])
  Embedded Systems Engineer
  http://www.embed.me.uk

--