From patchwork Mon Oct 6 09:55:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 38358 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC8AB20350 for ; Mon, 6 Oct 2014 09:56:30 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gi9sf2537761lab.2 for ; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=pl3vzxBfXrwA46bUPM3rF8K6yeY3XwOvjEwl5xHZjnc=; b=BjwMkKeDwlKGdnixEPDDTuBBOs5s4yt2XoLCGNt1yzkehpWumPEuFu8n2tnVNU5C42 h8BJVykDnLL9VIjd8/E17igKtCy0Ogg+cdnXSSraE/JunV1hHyW5tykDJxbK1IyWy1AU 2FukLRQnB/+Loko2DdDah9YcWJfkHbdeiHnb34TNHJcp0VzmRnq5fZvU+6rkkYEphWdw c5rFEiT0hESMNoqDVI0dzJmd3KnYSl9yFGG6O4HzX725lDE46x9fLr+UfyOWuzNcRy8U dKWR5K1uUJ+KBTVvaJetBL3QIDyAoj4NTqVloaH1r4hO6p3K0FGrd+L4cPPscg9qCYg3 Q6Bg== X-Gm-Message-State: ALoCoQkBoVEJvcV4nx8woNoBwt6+rGhER2cxmkNdKiZ+08N4MRQ/N/N3t63Y+2xNEnvCiEx0gBES X-Received: by 10.194.100.3 with SMTP id eu3mr241485wjb.6.1412589389466; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.5 with SMTP id a5ls556853lae.19.gmail; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) X-Received: by 10.112.126.194 with SMTP id na2mr22432636lbb.70.1412589389305; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by mx.google.com with ESMTPS id ld4si23102311lab.73.2014.10.06.02.56.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 02:56:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id gb8so4043420lab.31 for ; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) X-Received: by 10.112.134.229 with SMTP id pn5mr22734510lbb.22.1412589389061; Mon, 06 Oct 2014 02:56:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp154289lbb; Mon, 6 Oct 2014 02:56:28 -0700 (PDT) X-Received: by 10.70.133.133 with SMTP id pc5mr2027365pdb.135.1412589387301; Mon, 06 Oct 2014 02:56:27 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j9si535519pdm.6.2014.10.06.02.56.26 for ; Mon, 06 Oct 2014 02:56:27 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 11F12717D6; Mon, 6 Oct 2014 09:56:23 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by mail.openembedded.org (Postfix) with ESMTP id A068A601A8 for ; Mon, 6 Oct 2014 09:55:14 +0000 (UTC) Received: by mail-wg0-f52.google.com with SMTP id a1so6026161wgh.23 for ; Mon, 06 Oct 2014 02:55:15 -0700 (PDT) X-Received: by 10.194.47.134 with SMTP id d6mr28357061wjn.76.1412589315394; Mon, 06 Oct 2014 02:55:15 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id ka3sm16775801wjc.3.2014.10.06.02.55.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Oct 2014 02:55:14 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Mon, 6 Oct 2014 11:55:00 +0200 Message-Id: <1412589301-6669-2-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1412589301-6669-1-git-send-email-koen.kooi@linaro.org> References: <1412589301-6669-1-git-send-email-koen.kooi@linaro.org> Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH 2/3] php 5.4.14 : remove references to sysroot in target package X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 --- meta-oe/recipes-devtools/php/php_5.4.14.bb | 9 +++++++++ 1 file changed, 9 insertions(+) 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}"