modphp fixes

The following changes since commit 9e701bb060325bc47509d4874bd695f039191ea8:

libconfig: port from classic and update (2012-10-10 12:35:07 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/modphp-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/modphp-fixes

Paul Eggleton (2):
modphp: fix rpath QA issue
modphp: make LICENSE more accurate

 meta-webserver/recipes-php/modphp/modphp5.inc      |    6 +++++-
 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

1.7.9.5

Fixes the following QA issue:

ERROR: QA Issue: package modphp contains bad RPATH ${STAGING_DIR_TARGET}/usr/lib in file ${WORKDIR}/packages-split/modphp/usr/lib/apache2/modules/libphp5.so

---
 meta-webserver/recipes-php/modphp/modphp5.inc      |    4 ++++
 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

index 344eb31..2a73e90 100644
@@ -52,6 +52,10 @@ do_configure() {
 	find . -name config.m4 -o -name configure | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
 	export PHP_LIBXML_DIR=${STAGING_DIR_NATIVE}${layout_exec_prefix} 
 	oe_runconf
+
+	# No libtool, we really don't want rpath set...
+	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 }
 
 do_install  () {

index 707f5f9..a4011b6 100644
@@ -1,5 +1,5 @@
 include modphp5.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "7caac4f71e2f21426c11ac153e538392"
 SRC_URI[sha256sum] = "c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3"

1.7.9.5

PHP 5 is distributed under the PHP 3.01 license (which we identify as PHP-3.0 as far as common license files go).

Fixes the following warning:

WARNING: modphp: No generic license file exists for: PHP in any provider

---
 meta-webserver/recipes-php/modphp/modphp5.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 2a73e90..55e7c92 100644
@@ -1,6 +1,6 @@
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module."
-LICENSE = "PHP"
+LICENSE = "PHP-3.0"
 DEPENDS = "apache2-native apache2 zlib"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \

1.7.9.5

Speaking of modphp:

18:05 hrw@puchatek:build$ bitbake apache2 modphp
Parsing of 1253 .bb files complete (1244 cached, 9 parsed). 1609 targets, 60 skipped, 0 masked, 0 errors.

Build Configuration:

BB_VERSION        = "1.16.0"
TARGET_ARCH       = "aarch64"
TARGET_OS         = "linux"
MACHINE           = "genericarmv8"
DISTRO_VERSION    = "oe-core.0"
TUNE_FEATURES     = "aarch64"
meta-aarch64      = "public:afe73a6c8cb3d8724f66408e707845a0821cfc0d"
meta              = "master:7414cc6fd43249e33483684bc40c2f58d6a94c02"
meta-oe           
meta-webserver    = "master:9e701bb060325bc47509d4874bd695f039191ea8"
meta-linaro       = "master:318cd177663d23e598013f39024bf526d6473125"
toolchain-layer   = "master:9e701bb060325bc47509d4874bd695f039191ea8"

NOTE: Resolving any missing task queue dependencies
NOTE: Preparing runqueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
WARNING: modphp: No generic license file exists for: PHP in any provider
ERROR: Function failed: do_install (see /home/hrw/HDD/devel/canonical/aarch64/build/tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/temp/log.do_install.12308 for further information)
ERROR: Logfile of failure stored in: /home/hrw/HDD/devel/canonical/aarch64/build/tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/temp/log.do_install.12308 Log data follows:

| DEBUG: SITE files ['endian-little', 'bit-64', 'arm-common', 'common-linux', 'common-glibc', 'aarch64-linux', 'common']
| DEBUG: Executing shell function do_install
| install: cannot stat `libs/libphp5.so': No such file or directory
| ERROR: Function failed: do_install (see /home/hrw/HDD/devel/canonical/aarch64/build/tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/temp/log.do_install.12308 for further information)

ERROR: Task 14 (/home/hrw/HDD/devel/canonical/aarch64/meta-openembedded/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb, do_install) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1075 tasks of which 1068 didn't need to be rerun and 1 failed.
No currently running tasks (1075 of 1080)

Summary: 1 task failed:
/home/hrw/HDD/devel/canonical/aarch64/meta-openembedded/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb, do_install
Summary: There was 1 WARNING message shown.
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
18:13 hrw@puchatek:build$ find tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/ -name libphp* tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/libphp5.la tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/.libs/libphp5.a tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/.libs/libphp5.la tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/.libs/libphp5.lai tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/sapi/apache/libphp5.module.in tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/sapi/apache_hooks/libphp5.module.in tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/libs/libphp5.a tmp-eglibc/work/aarch64-oe-linux/modphp-5.3.14-r1/php-5.3.14/libs/libphp5.la

Will have to take a look at it on Monday.

Looks like it thinks it's supposed to be producing static libraries for some reason - when I build here (for qemuarm at the moment) I have these files:

[paul@morpheus php-5.3.14]$ find . -name 'libphp*' ./libs/libphp5.so
./libs/libphp5.la ./sapi/apache_hooks/libphp5.module.in ./sapi/apache/libphp5.module.in ./.libs/libphp5.lai
./.libs/libphp5.so
./.libs/libphp5.la
./libphp5.la

Not sure what would cause that specifically, but it's a clue at least.

Cheers,
Paul

Paul Eggleton
Intel Open Source Technology Centre

W dniu 12.10.2012 19:58, Paul Eggleton pisze:

Your do_configure did that. config.{sub,guess} were too old for AArch64.

If you can make the build succeed without overriding do_configure, then please send patches. I didn't have any success with that the last time I tried it.

Cheers,
Paul

Paul Eggleton
Intel Open Source Technology Centre

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 15-10-12 12:59, Paul Eggleton schreef:

adding a gnu-confiigize --force should be same enough, right?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQe/JtMkyGM64RGpERAntLAJ9VramIDLwLDfdTd7XZLS0+45l0WgCfRdJl wvR2aaU6t4/22x7kFLbaOs4=
=3Ftz
-----END PGP SIGNATURE-----

W dniu 15.10.2012 13:24, Koen Kooi pisze:

Yes, it did the trick. Thanks.