From: Gustavo Zacarias <gustavo@zacarias.com.ar>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCHv2 2/4] package/ncurses: fixup library symlink for static libs
Date: Wed, 20 Aug 2014 11:06:19 -0300 [thread overview]
Message-ID: <1408543581-15702-3-git-send-email-gustavo@zacarias.com.ar> (raw)
In-Reply-To: <1408543581-15702-1-git-send-email-gustavo@zacarias.com.ar>
As stated on the list we need to copy static libraries when doing static
targets so add the logic for that.
Also exclude the wide option for blackfin flat since there seem to be
toolchain issues with that combination - since it's a new feature option
someone interested might look into it later.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ncurses/Config.in | 2 ++
package/ncurses/ncurses.mk | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
index b90ec9e..3cc0a37 100644
--- a/package/ncurses/Config.in
+++ b/package/ncurses/Config.in
@@ -13,6 +13,8 @@ if BR2_PACKAGE_NCURSES
config BR2_PACKAGE_NCURSES_WCHAR
bool "enable wide char support"
depends on BR2_USE_WCHAR
+ # Build broken @ curses.priv.h with bad declarations
+ depends on !(BR2_bfin && BR2_BINFMT_FLAT)
help
Enable wide char & UTF-8 support in ncurses libraries
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index bd2aac0..81a3998 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -40,15 +40,26 @@ ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
NCURSES_CONF_OPT += --enable-widec
NCURSES_LIB_SUFFIX = w
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
define NCURSES_LINK_LIBS
for lib in $(NCURSES_LIBS-y); do \
+ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \
+ $(1)/usr/lib/$${lib}.a; \
+ done
+endef
+else
+define NCURSES_LINK_LIBS
+ for lib in $(NCURSES_LIBS-y); do \
+ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \
+ $(1)/usr/lib/$${lib}.a; \
ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \
$(1)/usr/lib/$${lib}.so; \
done
endef
+endif
-NCURSES_LINK_TARGET_LIBS = $(call NCURSES_LINK_LIBS, $(TARGET_DIR))
-NCURSES_LINK_STAGING_LIBS = $(call NCURSES_LINK_LIBS, $(STAGING_DIR))
+NCURSES_LINK_TARGET_LIBS = $(call NCURSES_LINK_LIBS, $(TARGET_DIR))
+NCURSES_LINK_STAGING_LIBS = $(call NCURSES_LINK_LIBS, $(STAGING_DIR))
NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS
--
1.8.5.5
next prev parent reply other threads:[~2014-08-20 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 14:06 [Buildroot] [PATCHv2 0/4] Ncurses wide support Gustavo Zacarias
2014-08-20 14:06 ` [Buildroot] [PATCHv2 1/4] package/ncurses: Allow building wide char support Gustavo Zacarias
2014-09-15 21:42 ` Peter Korsgaard
2014-09-15 22:13 ` Gustavo Zacarias
2014-08-20 14:06 ` Gustavo Zacarias [this message]
2014-08-20 14:06 ` [Buildroot] [PATCHv2 3/4] nano: enable ncursesw support Gustavo Zacarias
2014-08-20 14:06 ` [Buildroot] [PATCHv2 4/4] httping: enable ncurses support Gustavo Zacarias
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=1408543581-15702-3-git-send-email-gustavo@zacarias.com.ar \
--to=gustavo@zacarias.com.ar \
--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.