From: Valentine Barshak <gvaxon@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] sylpheed: Fix includedir
Date: Sat, 6 Oct 2012 22:55:06 +0400 [thread overview]
Message-ID: <1349549706-24827-1-git-send-email-gvaxon@gmail.com> (raw)
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 <gvaxon@gmail.com>
---
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
--
1.7.11.4
next reply other threads:[~2012-10-06 18:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-06 18:55 Valentine Barshak [this message]
2012-10-07 11:09 ` [Buildroot] [PATCH v2] sylpheed: Fix includedir Arnout Vandecappelle
2012-10-07 22:39 ` Valentine Barshak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349549706-24827-1-git-send-email-gvaxon@gmail.com \
--to=gvaxon@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox