[oe,meta-oe,2/3] php 5.4.14 : remove references to sysroot in target package

Message ID 1412589301-6669-2-git-send-email-koen.kooi@linaro.org
State New
Headers show

Commit Message

Koen Kooi Oct. 6, 2014, 9:55 a.m.
This fixes:

WARNING: QA Issue: php requires /build/linaro/build/build/tmp-glibc/work/armv7at2hf-vfp-oe-linux-gnueabi/php/5.4.14-r5.0/image/usr/bin/php, but no providers in its RDEPENDS [file-rdeps]

The only sysroot references left are for the stored configure line:

[koen@thinkpad image]$ grep linaro . -rn
Binair bestand ./usr/sbin/php-fpm bevat de gezochte tekst.
./usr/include/php/main/build-defs.h:21:#define CONFIGURE_COMMAND " '/build/linaro/build/build/tmp-glibc/work/aarch64-oe-linux/php/5.4.14-r6/php-5.4.14/configure'  '--build=x86_64-linux' '--host=aarch64-oe-linux' '--target=aarch64-oe-linux' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/lib/php' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib' '--includedir=/usr/include' '--oldincludedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' '--with-libtool-sysroot=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--enable-mbstring' '--enable-wddx' '--enable-fpm' '--with-imap=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--with-gettext=/usr/lib/..' '--with-imap-ssl=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--with-zlib=/usr/lib/..' '--with-iconv=/usr/lib/..'
  \
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--enable-nls' '--with-mysql=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr' '--with-mysqli=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr/bin/crossscripts/mysql_config' '--with-pdo-mysql=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr/bin/crossscripts/mysql_config' '--with-sqlite3=/usr/lib/..' '--with-pdo-sqlite=/usr/lib/..'"
Binair bestand ./usr/bin/phar.phar bevat de gezochte tekst.
./usr/bin/php-config:20:configure_options=" '--build=x86_64-linux' '--host=aarch64-oe-linux' '--target=aarch64-oe-linux' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/usr/lib/php' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib' '--includedir=/usr/include' '--oldincludedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' '--with-libtool-sysroot=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--enable-mbstring' '--enable-wddx' '--enable-fpm' '--with-imap=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--with-gettext=/usr/lib/..' '--with-imap-ssl=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8' '--with-zlib=/usr/lib/..' '--with-iconv=/usr/lib/..' \
'--enable-sockets' '--enable-pcntl' '--enable-shared' '--enable-nls' '--with-mysql=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr' '--with-mysqli=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr/bin/crossscripts/mysql_config' '--with-pdo-mysql=/build/linaro/build/build/tmp-glibc/sysroots/genericarmv8/usr/bin/crossscripts/mysql_config' '--with-sqlite3=/usr/lib/..' '--with-pdo-sqlite=/usr/lib/..'"
Binair bestand ./usr/bin/php-cgi bevat de gezochte tekst.
Binair bestand ./usr/bin/php bevat de gezochte tekst.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
 meta-oe/recipes-devtools/php/php_5.4.14.bb | 9 +++++++++
 1 file changed, 9 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-devtools/php/php_5.4.14.bb b/meta-oe/recipes-devtools/php/php_5.4.14.bb
index 98a8cdc..b738701 100644
--- a/meta-oe/recipes-devtools/php/php_5.4.14.bb
+++ b/meta-oe/recipes-devtools/php/php_5.4.14.bb
@@ -114,6 +114,15 @@  do_install_append_class-target() {
         rmdir ${TMP}
         TMP=`dirname ${TMP}`;
     done
+
+    # Remove references to sysroot
+    for script in peardev pear pecl php-config ; do
+        sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g -e  s:${STAGING_LIBDIR}:${libdir}:g ${D}${bindir}/$script
+    done
+
+    for header in ${D}${includedir}/php/main/*.h ${D}${includedir}/php/ext/iconv/*.h ; do
+        sed -i -e s:${STAGING_LIBDIR}:${libdir}:g -e s:${STAGING_INCDIR}:${includedir}:g $header
+    done
 }
 
 PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"