From patchwork Sun Oct 7 22:39:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 189869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id B38122C026A for ; Mon, 8 Oct 2012 09:39:13 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EF7D2805FB; Sun, 7 Oct 2012 22:39:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N2pEZikJA+5E; Sun, 7 Oct 2012 22:39:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 847A180589; Sun, 7 Oct 2012 22:39:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6556A8F74A for ; Sun, 7 Oct 2012 22:39:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8CB6F80584 for ; Sun, 7 Oct 2012 22:39:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LNr7Ivyhn9Wr for ; Sun, 7 Oct 2012 22:39:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-la0-f43.google.com (mail-la0-f43.google.com [209.85.215.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0E6A8805AC for ; Sun, 7 Oct 2012 22:39:02 +0000 (UTC) Received: by mail-la0-f43.google.com with SMTP id i5so2658155lah.16 for ; Sun, 07 Oct 2012 15:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=EbKppk7kG5WbYf0iwRih7Shbeu9SJ1L4yewEz2osDx0=; b=qpgReKub8d2uuHG5G9BfVt8fTiofmTz+D6GamI6azYLUcZB5XaKQe93BNe+m7d8LJg FOVQresYSJBjecAXrjQUvJNpgDmF9VEgfLLDeIEdXN0mPdBxukXsT86+RRycmBgrHNUe vXK76kPgpv4gir2wFLskePRBesiekoDGck6DWAwmk0lbq5MAzm1OMQGCkET8BlaNAPTh c0G521xf7AHlb7rY9Q2S/n7TH+IlZ+Swvus1OjB4ZMubeAp5FDY3A9kVC2CPtYNvCNxg KNJcftV0oGtlibWEqMcLRjboQgAuXUcirni/tfhrnXG2jRaWtiuVlKP192wiqHpNMPP7 NycQ== Received: by 10.152.112.233 with SMTP id it9mr11652327lab.40.1349649542694; Sun, 07 Oct 2012 15:39:02 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPS id gd18sm4869726lab.1.2012.10.07.15.39.02 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Oct 2012 15:39:02 -0700 (PDT) From: Valentine Barshak To: buildroot@busybox.net Date: Mon, 8 Oct 2012 02:39:59 +0400 Message-Id: <1349649599-12615-1-git-send-email-gvaxon@gmail.com> X-Mailer: git-send-email 1.7.11.4 Subject: [Buildroot] [PATCH v3] sylpheed: Fix includedir X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The sylpheed headers are installed to $(DESTDIR)$(includedir), while DESTDIR is $(TARGET_DIR) and includedir is set to $(STAGING_DIR)/usr/include in the SYLPHEED_CONF_OPT. Thus, the full staging directory path is created in the target root filesystem, which is wrong. The includedir was set to staging include because sylpheed incorrectly adds includedir to its include path, and does not cross-compile with the default includedir set to /usr/include. This removes includedir setting and also removes it from include paths in Makefiles to prevent using host headers from /usr/include. The same approach is used in the OE. Signed-off-by: Valentine Barshak Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/sylpheed/sylpheed.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index 451c4de..32c0a82 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -9,11 +9,20 @@ SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).$(SYLPHEED_VERSION_MINOR) SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) -SYLPHEED_CONF_OPT = --disable-gtkspell \ - --includedir=$(STAGING_DIR)/usr/include +SYLPHEED_CONF_OPT = --disable-gtkspell SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2 +# Remove the -I$(includedir) from the Makefiles +# because it refers to the host /usr/include. +define SYLPHEED_PRECONFIGURE + for i in $$(find $(@D) -name "Makefile*"); do \ + sed -i 's:-I$$(includedir)::g' $$i; \ + done +endef + +SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE + ifeq ($(BR2_PACKAGE_OPENSSL),y) SYLPHEED_DEPENDENCIES += openssl SYLPHEED_CONF_OPT += --enable-ssl