[oe-commits] Paul Eggleton : modphp: fix rpath QA issue

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 13338589e5f5adaf0470aa6cb87cde6ba745bd31
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=13338589e5f5adaf0470aa6cb87cde6ba745bd31

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Oct 12 17:30:54 2012 +0100

modphp: fix rpath QA issue

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

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 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 deletions(-)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 344eb31..2a73e90 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -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  () {
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb b/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
index 707f5f9..a4011b6 100644
--- a/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
+++ b/meta-webserver/recipes-php/modphp/modphp_5.3.14.bb
@@ -1,5 +1,5 @@
 include modphp5.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "7caac4f71e2f21426c11ac153e538392"
 SRC_URI[sha256sum] = "c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3"