From patchwork Sat Oct 6 18:55:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 189753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C5B2F2C0321 for ; Sun, 7 Oct 2012 05:54:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0EC7920CAA; Sat, 6 Oct 2012 18:54:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8GYaLh4RqRie; Sat, 6 Oct 2012 18:54:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E4BAD21F9A; Sat, 6 Oct 2012 18:54:24 +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 4D5618F74B for ; Sat, 6 Oct 2012 18:54:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CEB9E8AAA8 for ; Sat, 6 Oct 2012 18:54:23 +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 S5tDxlfCZshc for ; Sat, 6 Oct 2012 18:54:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2BC7F8A9F2 for ; Sat, 6 Oct 2012 18:54:21 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id m4so3194738lbo.16 for ; Sat, 06 Oct 2012 11:54:20 -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=yYGQzf0PxhD9OrD7mJ2hJuWj7TfaNLSXGa+4s3JH6kE=; b=iwazlra/xEuIDzkNBv/a4x5cZkuYT2tuxKB4TmcJ5Sa3tamlGqLMMjzd2qJeilaPDc oI0lRFPT0tBeKbEE5FpdbknPQBBEkRZP2G2nj/YWboma1WdsuGbTh1ApwzouW+OH2mhj 4xM1yt2wkAHWIxTVtYF8aMkYAAjUbuji3lKkBWN2AVMq2M3rbE/cFl4SkjCM1wIgLUA/ 3CyTTMvsdV++WLkM19JiE2pGuGmzwXwaRL6iEatQOyKS8tULXU5JmrcNn1WPhRvbEUKu TDkzqcYBWZLhmnUjDbl3zmMxmvjWu8IIYc9ktoRUIJjHMkMtStzB76Sz4MlYZLHEMQK4 0kJQ== Received: by 10.112.87.161 with SMTP id az1mr4815477lbb.99.1349549660034; Sat, 06 Oct 2012 11:54:20 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPS id oj5sm4076419lab.8.2012.10.06.11.54.19 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 11:54:19 -0700 (PDT) From: Valentine Barshak To: buildroot@busybox.net Date: Sat, 6 Oct 2012 22:55:06 +0400 Message-Id: <1349549706-24827-1-git-send-email-gvaxon@gmail.com> X-Mailer: git-send-email 1.7.11.4 Subject: [Buildroot] [PATCH v2] 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 the target directory, creating full staging directory path in the target rootfs, which is wrong. This happens because the 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. The includedir was set to staging include because sylpheed incorrectly adds includedir to its include path, and does not build with the default includedir set to /usr/include in the target filesystem. This removes includedir setting and also removes it from include paths in Makefiles. The same approach is used in the OE. Signed-off-by: Valentine Barshak Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/sylpheed/sylpheed.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index 451c4de..100fd67 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -9,11 +9,18 @@ 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 +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