From patchwork Fri Oct 5 17:25:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 189539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 93DDE2C0098 for ; Sat, 6 Oct 2012 03:26:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0BF3D1003D1; Fri, 5 Oct 2012 17:26:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id USqWYa0TkfwV; Fri, 5 Oct 2012 17:26:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B37E7101B10; Fri, 5 Oct 2012 17:25:58 +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 005A58F74A for ; Fri, 5 Oct 2012 17:26:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7C27E8BE6E for ; Fri, 5 Oct 2012 17:26:01 +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 RHG6n+2V12rW for ; Fri, 5 Oct 2012 17:25:52 +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 82B4F8F639 for ; Fri, 5 Oct 2012 17:24:54 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id m4so2498196lbo.16 for ; Fri, 05 Oct 2012 10:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=U1Bb7eUgc84w995eMr5p3xPmEQx8nFDQxommCeUiU6o=; b=aMBBBGhPrx4G44ABZchxxw2ZBF3bSCSHKKSAjtZg8zLPuQrdx4ZUROQeKHEcMLQcCS ky+vR9VdPnUxEVCxX8nLZhZjWwGvUlpEgtb1J6y89gaOE6WclLChRlE7QeyMxdSleoqu +ixYJyKl6ZDWfirKQR3ub5bEl4LkVOxPpj5bBfv3/mCJmyUcDQiVixaCgrtKPybLXiRi DLr7Z3DGM+QfdaXYUrG8/Om2q4HNwN7vs5cW8fRCTSIAQsAtfd7Rhi/tnU90dzpEFzDx oOQ47bAS88Ju9QWmwOL1acIpGsT+MwoX6NdL+THj6Wa+Bvfl2yr2VdMum6vTnepz8dPu 26LQ== Received: by 10.112.29.199 with SMTP id m7mr3962649lbh.2.1349457892361; Fri, 05 Oct 2012 10:24:52 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPS id a8sm1250949lbb.5.2012.10.05.10.24.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 10:24:51 -0700 (PDT) From: Valentine Barshak To: buildroot@busybox.net Date: Fri, 5 Oct 2012 21:25:34 +0400 Message-Id: <1349457934-6208-1-git-send-email-gvaxon@gmail.com> X-Mailer: git-send-email 1.7.11.4 Subject: [Buildroot] [PATCH] 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 set to $(TARGET_DIR) and includedir is $(STAGING_DIR)/usr/include. Remove $(DESTDIR) from the include paths in the Makefile to have sylpheed install its headers to staging include directory instead. Signed-off-by: Valentine Barshak --- package/sylpheed/sylpheed-fix-includedir.patch | 89 ++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 package/sylpheed/sylpheed-fix-includedir.patch diff --git a/package/sylpheed/sylpheed-fix-includedir.patch b/package/sylpheed/sylpheed-fix-includedir.patch new file mode 100644 index 0000000..3971699 --- /dev/null +++ b/package/sylpheed/sylpheed-fix-includedir.patch @@ -0,0 +1,89 @@ +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 set to +$(TARGET_DIR) and includedir is $(STAGING_DIR)/usr/include. + +Remove $(DESTDIR) from the include paths in the Makefile +to have sylpheed install its headers to staging include +directory instead. + +Signed-off-by: Valentine Barshak + +diff -pruN sylpheed-3.1.0.orig/libsylph/Makefile.in sylpheed-3.1.0/libsylph/Makefile.in +--- sylpheed-3.1.0.orig/libsylph/Makefile.in 2012-09-25 22:47:21.794759554 +0400 ++++ sylpheed-3.1.0/libsylph/Makefile.in 2012-09-25 22:47:39.797760345 +0400 +@@ -502,20 +502,20 @@ uninstall-info-am: + libsylph_0includeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libsylph_0includeHEADERS: $(libsylph_0include_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libsylph_0includedir) ++ $(mkinstalldirs) $(libsylph_0includedir) + @list='$(libsylph_0include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libsylph_0includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libsylph_0includedir)/$$f"; \ +- $(libsylph_0includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libsylph_0includedir)/$$f; \ ++ echo " $(libsylph_0includeHEADERS_INSTALL) $$d$$p $(libsylph_0includedir)/$$f"; \ ++ $(libsylph_0includeHEADERS_INSTALL) $$d$$p $(libsylph_0includedir)/$$f; \ + done + + uninstall-libsylph_0includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libsylph_0include_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libsylph_0includedir)/$$f"; \ +- rm -f $(DESTDIR)$(libsylph_0includedir)/$$f; \ ++ echo " rm -f $(libsylph_0includedir)/$$f"; \ ++ rm -f $(libsylph_0includedir)/$$f; \ + done + + ETAGS = etags +@@ -609,7 +609,7 @@ check: $(BUILT_SOURCES) + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libsylph_0includedir) ++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(libsylph_0includedir) + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +diff -pruN sylpheed-3.1.0.orig/src/Makefile.in sylpheed-3.1.0/src/Makefile.in +--- sylpheed-3.1.0.orig/src/Makefile.in 2012-09-25 22:47:21.803759364 +0400 ++++ sylpheed-3.1.0/src/Makefile.in 2012-09-25 22:47:39.798760332 +0400 +@@ -771,20 +771,20 @@ uninstall-info-am: + libsylpheed_plugin_0includeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libsylpheed_plugin_0includeHEADERS: $(libsylpheed_plugin_0include_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libsylpheed_plugin_0includedir) ++ $(mkinstalldirs) $(libsylpheed_plugin_0includedir) + @list='$(libsylpheed_plugin_0include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libsylpheed_plugin_0includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libsylpheed_plugin_0includedir)/$$f"; \ +- $(libsylpheed_plugin_0includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libsylpheed_plugin_0includedir)/$$f; \ ++ echo " $(libsylpheed_plugin_0includeHEADERS_INSTALL) $$d$$p $(libsylpheed_plugin_0includedir)/$$f"; \ ++ $(libsylpheed_plugin_0includeHEADERS_INSTALL) $$d$$p $(libsylpheed_plugin_0includedir)/$$f; \ + done + + uninstall-libsylpheed_plugin_0includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libsylpheed_plugin_0include_HEADERS)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libsylpheed_plugin_0includedir)/$$f"; \ +- rm -f $(DESTDIR)$(libsylpheed_plugin_0includedir)/$$f; \ ++ echo " rm -f $(libsylpheed_plugin_0includedir)/$$f"; \ ++ rm -f $(libsylpheed_plugin_0includedir)/$$f; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -963,7 +963,7 @@ install-binPROGRAMS: install-libLTLIBRAR + + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libsylpheed_plugin_0includedir) ++ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(libsylpheed_plugin_0includedir) + + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive