From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] host-pkgconf: use --static option for static builds
Date: Wed, 5 Mar 2014 12:19:37 +0000 [thread overview]
Message-ID: <1394021977-60055-1-git-send-email-Vincent.Riera@imgtec.com> (raw)
Detect when BR2_PREFER_STATIC_LIBS is selected and modify the host
pkg-config wrapper to append the --static option in that case.
Fixes:
http://autobuild.buildroot.net/results/161/161446dde7e8e774773eb2b34fd555f5ac22dd02/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
package/pkgconf/pkg-config.in | 2 +-
package/pkgconf/pkgconf.mk | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
index 25a536b..4dec487 100644
--- a/package/pkgconf/pkg-config.in
+++ b/package/pkgconf/pkg-config.in
@@ -1,2 +1,2 @@
#!/bin/sh
-PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:- at PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:- at STAGING_DIR@} $(dirname $0)/pkgconf $@
+PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:- at PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:- at STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@
diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk
index f3f6526..9641371 100644
--- a/package/pkgconf/pkgconf.mk
+++ b/package/pkgconf/pkgconf.mk
@@ -24,8 +24,22 @@ define HOST_PKGCONF_INSTALL_WRAPPER
$(HOST_DIR)/usr/bin/pkg-config
endef
+define HOST_PKGCONF_STATIC
+ $(SED) 's, at STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config
+endef
+
+define HOST_PKGCONF_SHARED
+ $(SED) 's, at STATIC@,,' $(HOST_DIR)/usr/bin/pkg-config
+endef
+
PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
+else
+ HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED
+endif
+
$(eval $(autotools-package))
$(eval $(host-autotools-package))
--
1.7.1
next reply other threads:[~2014-03-05 12:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 12:19 Vicente Olivert Riera [this message]
2014-04-08 3:58 ` [Buildroot] host-pkgconf: use --static option for static builds Baruch Siach
2014-05-01 12:49 ` Baruch Siach
2014-05-01 13:51 ` Vicente Olivert Riera
2014-05-02 22:00 ` Arnout Vandecappelle
2014-05-05 8:10 ` Thomas Petazzoni
2014-05-07 14:43 ` [Buildroot] [PATCH] " Arnout Vandecappelle
2014-05-07 16:47 ` Baruch Siach
2014-05-07 17:05 ` Arnout Vandecappelle
2014-05-07 20:40 ` Peter Korsgaard
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=1394021977-60055-1-git-send-email-Vincent.Riera@imgtec.com \
--to=vincent.riera@imgtec.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.