aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-12 17:30:54 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-15 11:02:22 +0100
commit13338589e5f5adaf0470aa6cb87cde6ba745bd31 (patch)
tree5cd07e85c147c7a47e991f32811c5c5da23045c7 /meta-webserver
parenta6614039ee04605d4b5efe6b2c2942dc9d0aac4d (diff)
downloadmeta-openembedded-13338589e5f5adaf0470aa6cb87cde6ba745bd31.tar.gz
meta-openembedded-13338589e5f5adaf0470aa6cb87cde6ba745bd31.tar.bz2
meta-openembedded-13338589e5f5adaf0470aa6cb87cde6ba745bd31.zip
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@linux.intel.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-php/modphp/modphp5.inc4
-rw-r--r--meta-webserver/recipes-php/modphp/modphp_5.3.14.bb2
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 344eb31d9..2a73e90e9 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 707f5f90b..a4011b693 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"