From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/3] gettext: Rename BR2_PACKAGE_LIBINTL to BR2_PACKAGE_GETTEXT_NEEDS_BINARIES
Date: Tue, 8 May 2012 13:19:17 +0200 [thread overview]
Message-ID: <1336475958-5714-2-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1336475958-5714-1-git-send-email-s.martin49@gmail.com>
libintl target does nothing but removing some binaries installed by
gettext.
This patch renames the BR2_PACKAGE_LIBINTL symbol to
BR2_PACKAGE_GETTEXT_NEEDS_BINARIES and fixes the logic for packages
that may need those gettext binaries.
It also adds a warning about libintl support depending on locale enabling
in the toolchain.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/gettext/Config.in | 16 ++++++++--------
package/gettext/gettext.mk | 2 +-
package/libidn/Config.in | 1 +
package/php/Config.ext | 1 +
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 0ee4065..461652f 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -12,12 +12,12 @@ config BR2_PACKAGE_GETTEXT
comment "gettext requires a toolchain with WCHAR support"
depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
-config BR2_PACKAGE_LIBINTL
- bool "libintl"
- depends on BR2_NEEDS_GETTEXT
- depends on BR2_USE_WCHAR
- help
- Selecting this package installs all of gettext in the staging
- directory and the shared library for it's use in the target.
+comment "libintl requires a toolchain with locale/i18n support"
+ depends on BR2_PACKAGE_GETTEXT && !BR2_ENABLE_LOCALE
- http://www.gnu.org/software/gettext/
+config BR2_PACKAGE_GETTEXT_NEEDS_BINARIES
+ bool
+ depends on BR2_PACKAGE_GETTEXT
+ help
+ Force to install gettext binaries (gettext, gettext.sh and gettextize)
+ in the target.
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 7c7b26c..0902edd 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -17,7 +17,7 @@ define GETTEXT_REMOVE_BINARIES
rm -f $(TARGET_DIR)/usr/bin/gettextize
endef
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
+ifneq ($(BR2_PACKAGE_GETTEXT_NEEDS_BINARIES),y)
GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_BINARIES
endif
diff --git a/package/libidn/Config.in b/package/libidn/Config.in
index dcf9724..3e98245 100644
--- a/package/libidn/Config.in
+++ b/package/libidn/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBIDN
bool "libidn"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+ select BR2_PACKAGE_GETTEXT_NEEDS_BINARIES if BR2_NEEDS_GETTEXT_IF_LOCALE
help
Libidn's purpose is to encode and decode internationalized
domain names.
diff --git a/package/php/Config.ext b/package/php/Config.ext
index bd630ee..2ea686c 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -68,6 +68,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
config BR2_PACKAGE_PHP_EXT_GETTEXT
bool "gettext"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+ select BR2_PACKAGE_GETTEXT_NEEDS_BINARIES if BR2_NEEDS_GETTEXT
depends on BR2_USE_WCHAR
help
gettext support
--
1.7.10.1
next prev parent reply other threads:[~2012-05-08 11:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-04 14:46 [Buildroot] [pull request] Pull request for branch for-2012.05/packages-updates Maxime Ripard
2012-04-04 14:46 ` [Buildroot] [PATCH 1/2] Convert gettext to autotargets Maxime Ripard
2012-04-04 14:56 ` Maxime Ripard
2012-05-08 11:19 ` [Buildroot] [PATCH 1/3] " Samuel Martin
2012-05-08 11:19 ` Samuel Martin [this message]
2012-05-11 21:37 ` [Buildroot] [PATCH 2/3] gettext: Rename BR2_PACKAGE_LIBINTL to BR2_PACKAGE_GETTEXT_NEEDS_BINARIES Arnout Vandecappelle
2012-05-11 22:45 ` Samuel Martin
2012-05-12 14:43 ` Arnout Vandecappelle
2012-05-08 11:19 ` [Buildroot] [PATCH 3/3] Cleanup gettext/libintl dependencies Samuel Martin
2012-05-19 21:46 ` [Buildroot] [PATCH 1/3] Convert gettext to autotargets Peter Korsgaard
2012-05-21 7:52 ` Samuel Martin
2012-05-21 8:02 ` Peter Korsgaard
2012-05-21 8:08 ` Will Newton
2012-05-21 8:12 ` Maxime Ripard
2012-05-21 8:12 ` Peter Korsgaard
2012-05-21 8:06 ` Maxime Ripard
2012-04-15 19:09 ` [Buildroot] [PATCH 1/1] " Samuel Martin
2012-04-04 14:46 ` [Buildroot] [PATCH 2/2] Bump systemd to version 44 Maxime Ripard
2012-04-05 11:16 ` 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=1336475958-5714-2-git-send-email-s.martin49@gmail.com \
--to=s.martin49@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 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.