* [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
@ 2012-10-14 21:09 ` Arnout Vandecappelle
2012-10-14 21:25 ` Yann E. MORIN
2012-10-14 21:09 ` [Buildroot] [PATCH 02/10] flex: " Arnout Vandecappelle
` (8 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:09 UTC (permalink / raw)
To: buildroot
Also add missing select in Config.in.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/diffutils/Config.in | 1 +
package/diffutils/diffutils.mk | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index 86da5d3..4cc16e2 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_DIFFUTILS
bool"diffutils"
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
GNU diff. Compare files per line.
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 168d040..2530763 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -6,8 +6,7 @@
DIFFUTILS_VERSION = 3.2
DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
-DIFFUTILS_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_GETTEXT),gettext)
+DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
DIFFUTILS_DEPENDENCIES += busybox
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected
2012-10-14 21:09 ` [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected Arnout Vandecappelle
@ 2012-10-14 21:25 ` Yann E. MORIN
0 siblings, 0 replies; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:25 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Also add missing select in Config.in.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/diffutils/Config.in | 1 +
> package/diffutils/diffutils.mk | 3 +--
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
> index 86da5d3..4cc16e2 100644
> --- a/package/diffutils/Config.in
> +++ b/package/diffutils/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_DIFFUTILS
> bool"diffutils"
> depends on BR2_USE_WCHAR
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> GNU diff. Compare files per line.
>
> diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
> index 168d040..2530763 100644
> --- a/package/diffutils/diffutils.mk
> +++ b/package/diffutils/diffutils.mk
> @@ -6,8 +6,7 @@
>
> DIFFUTILS_VERSION = 3.2
> DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
> -DIFFUTILS_DEPENDENCIES = \
> - $(if $(BR2_PACKAGE_GETTEXT),gettext)
> +DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
>
> ifeq ($(BR2_PACKAGE_BUSYBOX),y)
> DIFFUTILS_DEPENDENCIES += busybox
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 02/10] flex: only needs gettext if locale is selected
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
2012-10-14 21:09 ` [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected Arnout Vandecappelle
@ 2012-10-14 21:09 ` Arnout Vandecappelle
2012-10-14 21:25 ` Yann E. MORIN
2012-10-14 21:10 ` [Buildroot] [PATCH 03/10] ndisc6: " Arnout Vandecappelle
` (7 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:09 UTC (permalink / raw)
To: buildroot
Also add missing select in Config.in.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/flex/Config.in | 1 +
package/flex/flex.mk | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/flex/Config.in b/package/flex/Config.in
index b10eb00..8ce4ccd 100644
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_FLEX
bool "flex"
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
A fast lexical analyser generator. A tool for generating
programs that perform pattern-matching on text.
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 2599cdc..fe21432 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -11,8 +11,7 @@ FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
FLEX_INSTALL_STAGING = YES
-FLEX_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_GETTEXT),gettext)
+FLEX_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
# we don't have a host-gettext/libintl
HOST_FLEX_DEPENDENCIES =
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 02/10] flex: only needs gettext if locale is selected
2012-10-14 21:09 ` [Buildroot] [PATCH 02/10] flex: " Arnout Vandecappelle
@ 2012-10-14 21:25 ` Yann E. MORIN
0 siblings, 0 replies; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:25 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Also add missing select in Config.in.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/flex/Config.in | 1 +
> package/flex/flex.mk | 3 +--
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/flex/Config.in b/package/flex/Config.in
> index b10eb00..8ce4ccd 100644
> --- a/package/flex/Config.in
> +++ b/package/flex/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_FLEX
> bool "flex"
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> A fast lexical analyser generator. A tool for generating
> programs that perform pattern-matching on text.
> diff --git a/package/flex/flex.mk b/package/flex/flex.mk
> index 2599cdc..fe21432 100644
> --- a/package/flex/flex.mk
> +++ b/package/flex/flex.mk
> @@ -11,8 +11,7 @@ FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
> FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
> FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
> FLEX_INSTALL_STAGING = YES
> -FLEX_DEPENDENCIES = \
> - $(if $(BR2_PACKAGE_GETTEXT),gettext)
> +FLEX_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
> # we don't have a host-gettext/libintl
> HOST_FLEX_DEPENDENCIES =
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 03/10] ndisc6: only needs gettext if locale is selected
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
2012-10-14 21:09 ` [Buildroot] [PATCH 01/10] diffutils: only needs gettext if locale is selected Arnout Vandecappelle
2012-10-14 21:09 ` [Buildroot] [PATCH 02/10] flex: " Arnout Vandecappelle
@ 2012-10-14 21:10 ` Arnout Vandecappelle
2012-10-14 21:26 ` Yann E. MORIN
2012-10-14 21:10 ` [Buildroot] [PATCH 04/10] util-linux: " Arnout Vandecappelle
` (6 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:10 UTC (permalink / raw)
To: buildroot
Also add missing select in Config.in.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/ndisc6/Config.in | 1 +
package/ndisc6/ndisc6.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 126bfa2..6abe4ce 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -4,6 +4,7 @@ comment "ndisc6 requires a toolchain with IPv6 support"
config BR2_PACKAGE_NDISC6
bool "ndisc6 tools"
depends on BR2_INET_IPV6
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
NDisc6 is a small collection of useful tools for IPv6 networking
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index f58cc13..1d3c0e7 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -10,7 +10,7 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
NDISC6_DEPENDENCIES += gettext
NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
endif
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 03/10] ndisc6: only needs gettext if locale is selected
2012-10-14 21:10 ` [Buildroot] [PATCH 03/10] ndisc6: " Arnout Vandecappelle
@ 2012-10-14 21:26 ` Yann E. MORIN
0 siblings, 0 replies; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:26 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Also add missing select in Config.in.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/ndisc6/Config.in | 1 +
> package/ndisc6/ndisc6.mk | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
> index 126bfa2..6abe4ce 100644
> --- a/package/ndisc6/Config.in
> +++ b/package/ndisc6/Config.in
> @@ -4,6 +4,7 @@ comment "ndisc6 requires a toolchain with IPv6 support"
> config BR2_PACKAGE_NDISC6
> bool "ndisc6 tools"
> depends on BR2_INET_IPV6
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> NDisc6 is a small collection of useful tools for IPv6 networking
>
> diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
> index f58cc13..1d3c0e7 100644
> --- a/package/ndisc6/ndisc6.mk
> +++ b/package/ndisc6/ndisc6.mk
> @@ -10,7 +10,7 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
> NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
> NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
>
> -ifeq ($(BR2_PACKAGE_GETTEXT),y)
> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> NDISC6_DEPENDENCIES += gettext
> NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
> endif
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 04/10] util-linux: only needs gettext if locale is selected
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (2 preceding siblings ...)
2012-10-14 21:10 ` [Buildroot] [PATCH 03/10] ndisc6: " Arnout Vandecappelle
@ 2012-10-14 21:10 ` Arnout Vandecappelle
2012-10-14 21:26 ` Yann E. MORIN
2012-10-14 21:10 ` [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support Arnout Vandecappelle
` (5 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:10 UTC (permalink / raw)
To: buildroot
Also add missing select in Config.in.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/util-linux/Config.in | 1 +
package/util-linux/util-linux.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 43a8444..88d08e7 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_UTIL_LINUX
bool "util-linux"
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
Various useful/essential Linux utilities.
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 71a6c53..a6abbf5 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -29,7 +29,7 @@ else
UTIL_LINUX_CONF_OPT += --without-ncurses
endif
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
UTIL_LINUX_DEPENDENCIES += gettext
UTIL_LINUX_MAKE_OPT += LIBS=-lintl
endif
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 04/10] util-linux: only needs gettext if locale is selected
2012-10-14 21:10 ` [Buildroot] [PATCH 04/10] util-linux: " Arnout Vandecappelle
@ 2012-10-14 21:26 ` Yann E. MORIN
0 siblings, 0 replies; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:26 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Also add missing select in Config.in.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/util-linux/Config.in | 1 +
> package/util-linux/util-linux.mk | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
> index 43a8444..88d08e7 100644
> --- a/package/util-linux/Config.in
> +++ b/package/util-linux/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_UTIL_LINUX
> bool "util-linux"
> depends on BR2_LARGEFILE
> depends on BR2_USE_WCHAR
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> Various useful/essential Linux utilities.
>
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index 71a6c53..a6abbf5 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -29,7 +29,7 @@ else
> UTIL_LINUX_CONF_OPT += --without-ncurses
> endif
>
> -ifeq ($(BR2_PACKAGE_GETTEXT),y)
> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> UTIL_LINUX_DEPENDENCIES += gettext
> UTIL_LINUX_MAKE_OPT += LIBS=-lintl
> endif
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (3 preceding siblings ...)
2012-10-14 21:10 ` [Buildroot] [PATCH 04/10] util-linux: " Arnout Vandecappelle
@ 2012-10-14 21:10 ` Arnout Vandecappelle
2012-10-14 21:10 ` [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext Arnout Vandecappelle
` (4 subsequent siblings)
9 siblings, 0 replies; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:10 UTC (permalink / raw)
To: buildroot
lshw doesn't need libintl if -DNONLS is defined.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/lshw/Config.in | 2 +-
package/lshw/lshw.mk | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/package/lshw/Config.in b/package/lshw/Config.in
index 98beacd..afefa6c 100644
--- a/package/lshw/Config.in
+++ b/package/lshw/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LSHW
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
lshw (Hardware Lister) is a small tool to provide
detailed information on the hardware configuration of the machine.
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 68daa0d..b3c2214 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -6,10 +6,16 @@
LSHW_VERSION = B.02.16
LSHW_SITE = http://ezix.org/software/files
+
+LSHW_CFLAGS = $(TARGET_CFLAGS)
+ifeq ($(BR2_ENABLE_LOCALE),)
+LSHW_CFLAGS += -DNONLS
+endif
+
LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
- RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
-LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
-LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext)
+ RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
+LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
define LSHW_BUILD_CMDS
$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (4 preceding siblings ...)
2012-10-14 21:10 ` [Buildroot] [PATCH 05/10] lshw: fix build with no LOCALE support Arnout Vandecappelle
@ 2012-10-14 21:10 ` Arnout Vandecappelle
2012-10-14 21:27 ` Yann E. MORIN
2012-10-14 21:10 ` [Buildroot] [PATCH 07/10] pulseaudio: remove " Arnout Vandecappelle
` (3 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:10 UTC (permalink / raw)
To: buildroot
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/avahi/avahi.mk | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 03dc368..6a6f524 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -133,10 +133,7 @@ else
AVAHI_CONF_OPT += --disable-python
endif
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-AVAHI_DEPENDENCIES += gettext
-AVAHI_MAKE_OPT = LIBS=-lintl
-endif
+AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
define AVAHI_REMOVE_INITSCRIPT
rm -rf $(TARGET_DIR)/etc/init.d/avahi-*
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext
2012-10-14 21:10 ` [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext Arnout Vandecappelle
@ 2012-10-14 21:27 ` Yann E. MORIN
0 siblings, 0 replies; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:27 UTC (permalink / raw)
To: buildroot
Atnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/avahi/avahi.mk | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> index 03dc368..6a6f524 100644
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -133,10 +133,7 @@ else
> AVAHI_CONF_OPT += --disable-python
> endif
>
> -ifeq ($(BR2_PACKAGE_GETTEXT),y)
> -AVAHI_DEPENDENCIES += gettext
> -AVAHI_MAKE_OPT = LIBS=-lintl
> -endif
> +AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
>
> define AVAHI_REMOVE_INITSCRIPT
> rm -rf $(TARGET_DIR)/etc/init.d/avahi-*
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 07/10] pulseaudio: remove dependency on gettext
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (5 preceding siblings ...)
2012-10-14 21:10 ` [Buildroot] [PATCH 06/10] avahi: remove double dependency on gettext Arnout Vandecappelle
@ 2012-10-14 21:10 ` Arnout Vandecappelle
2012-10-15 9:45 ` Samuel Martin
2012-10-14 21:11 ` [Buildroot] [PATCH 08/10] gdk-pixbuf: " Arnout Vandecappelle
` (2 subsequent siblings)
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:10 UTC (permalink / raw)
To: buildroot
The dependency on gettext is only due to libglib2, not due to
portaudio itself. It works fine without gettext if libglib2 is
not selected.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
v2: actually remove the gettext dependency this time; thanks Thomas
---
package/multimedia/pulseaudio/Config.in | 1 -
package/multimedia/pulseaudio/pulseaudio.mk | 1 -
2 files changed, 2 deletions(-)
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 6c767bb..0844192 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_PULSEAUDIO
select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBSNDFILE
select BR2_PACKAGE_SPEEX
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
help
PulseAudio is a sound system for POSIX OSes, meaning that it
is a proxy for your sound applications. It allows you to do
diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 6396fef..7c2dbdc 100644
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -16,7 +16,6 @@ PULSEAUDIO_CONF_OPT = \
PULSEAUDIO_DEPENDENCIES = \
host-pkg-config libtool json-c libsndfile speex host-intltool \
- $(if $(BR2_NEEDS_GETTEXT),gettext) \
$(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 08/10] gdk-pixbuf: remove dependency on gettext
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (6 preceding siblings ...)
2012-10-14 21:10 ` [Buildroot] [PATCH 07/10] pulseaudio: remove " Arnout Vandecappelle
@ 2012-10-14 21:11 ` Arnout Vandecappelle
2012-10-14 21:11 ` [Buildroot] [PATCH 09/10] glib-networking: remove redundant " Arnout Vandecappelle
2012-10-14 21:11 ` [Buildroot] [PATCH 10/10] libsoup: " Arnout Vandecappelle
9 siblings, 0 replies; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:11 UTC (permalink / raw)
To: buildroot
The dependency on gettext comes from libglib2, not from gdk-pixbuf
itself.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/gdk-pixbuf/Config.in | 1 -
package/gdk-pixbuf/gdk-pixbuf.mk | 1 -
2 files changed, 2 deletions(-)
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 33b5f7c..f205793 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GDK_PIXBUF
bool "gdk-pixbuf"
depends on BR2_USE_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Gdk-Pixbuf is an image loader and scaler. It uses GObject
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 92a34bf..7e1dc37 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,7 +40,6 @@ GDK_PIXBUF_DEPENDENCIES += xlib_libX11
endif
GDK_PIXBUF_DEPENDENCIES += \
- $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
$(if $(BR2_ENABLE_LOCALE),,libiconv) \
host-pkg-config libglib2
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 09/10] glib-networking: remove redundant dependency on gettext
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (7 preceding siblings ...)
2012-10-14 21:11 ` [Buildroot] [PATCH 08/10] gdk-pixbuf: " Arnout Vandecappelle
@ 2012-10-14 21:11 ` Arnout Vandecappelle
2012-10-14 21:21 ` Yann E. MORIN
2012-10-14 21:11 ` [Buildroot] [PATCH 10/10] libsoup: " Arnout Vandecappelle
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:11 UTC (permalink / raw)
To: buildroot
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/glib-networking/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index dab35ea..f1aa7ee 100644
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_GLIB_NETWORKING
bool "glib-networking"
depends on BR2_USE_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
Network-related GIO modules for glib.
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 09/10] glib-networking: remove redundant dependency on gettext
2012-10-14 21:11 ` [Buildroot] [PATCH 09/10] glib-networking: remove redundant " Arnout Vandecappelle
@ 2012-10-14 21:21 ` Yann E. MORIN
2012-11-01 13:48 ` Arnout Vandecappelle
0 siblings, 1 reply; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:21 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/glib-networking/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
> index dab35ea..f1aa7ee 100644
> --- a/package/glib-networking/Config.in
> +++ b/package/glib-networking/Config.in
> @@ -2,7 +2,7 @@ config BR2_PACKAGE_GLIB_NETWORKING
> bool "glib-networking"
> depends on BR2_USE_WCHAR # glib2
> select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> Network-related GIO modules for glib.
The commit message says "remove redundant dependency on gettext", but this
change changes the dependency on plain gettext to gettext-if-locales.
Thus, I think the subject is wrong, and should be changed to something like:
glib-networking: only depends on gettext if locales are used
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 09/10] glib-networking: remove redundant dependency on gettext
2012-10-14 21:21 ` Yann E. MORIN
@ 2012-11-01 13:48 ` Arnout Vandecappelle
2012-11-01 14:02 ` Arnout Vandecappelle
0 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-11-01 13:48 UTC (permalink / raw)
To: buildroot
On 10/14/12 23:21, Yann E. MORIN wrote:
> Arnout, All,
>
> On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind)<arnout@mind.be>
>> ---
>> package/glib-networking/Config.in | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
>> index dab35ea..f1aa7ee 100644
>> --- a/package/glib-networking/Config.in
>> +++ b/package/glib-networking/Config.in
>> @@ -2,7 +2,7 @@ config BR2_PACKAGE_GLIB_NETWORKING
>> bool "glib-networking"
>> depends on BR2_USE_WCHAR # glib2
>> select BR2_PACKAGE_LIBGLIB2
>> - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
>> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
>> help
>> Network-related GIO modules for glib.
>
> The commit message says "remove redundant dependency on gettext", but this
> change changes the dependency on plain gettext to gettext-if-locales.
>
> Thus, I think the subject is wrong, and should be changed to something like:
> glib-networking: only depends on gettext if locales are used
Actually, on second revision: glib-networking uses gettext directly so we should
therefore select it here as well. It worked fine in testing because libglib2
anyway depends on locale.
Therefore, I'll replace this with unconditionally depending on gettext in
the .mk file.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 09/10] glib-networking: remove redundant dependency on gettext
2012-11-01 13:48 ` Arnout Vandecappelle
@ 2012-11-01 14:02 ` Arnout Vandecappelle
0 siblings, 0 replies; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-11-01 14:02 UTC (permalink / raw)
To: buildroot
On 11/01/12 14:48, Arnout Vandecappelle wrote:
> On 10/14/12 23:21, Yann E. MORIN wrote:
>> Arnout, All,
>>
>> On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
>>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind)<arnout@mind.be>
>>> ---
>>> package/glib-networking/Config.in | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
>>> index dab35ea..f1aa7ee 100644
>>> --- a/package/glib-networking/Config.in
>>> +++ b/package/glib-networking/Config.in
>>> @@ -2,7 +2,7 @@ config BR2_PACKAGE_GLIB_NETWORKING
>>> bool "glib-networking"
>>> depends on BR2_USE_WCHAR # glib2
>>> select BR2_PACKAGE_LIBGLIB2
>>> - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
>>> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
>>> help
>>> Network-related GIO modules for glib.
>>
>> The commit message says "remove redundant dependency on gettext", but this
>> change changes the dependency on plain gettext to gettext-if-locales.
>>
>> Thus, I think the subject is wrong, and should be changed to something like:
>> glib-networking: only depends on gettext if locales are used
>
> Actually, on second revision: glib-networking uses gettext directly so we should
> therefore select it here as well. It worked fine in testing because libglib2
> anyway depends on locale.
>
> Therefore, I'll replace this with unconditionally depending on gettext in
> the .mk file.
... but of course, the whole point of this series was to remove BR2_NEEDS_GETTEXT...
I'm just going to drop this patch for the time being, which leaves us with 3
packages using BR2_NEEDS_GETTEXT: php (gettext module), libglib2, glib-networking.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286540
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 10/10] libsoup: remove redundant dependency on gettext
2012-10-14 21:09 [Buildroot] [PATCH 00/10] Clean up improper dependencies on gettext without LOCALE Arnout Vandecappelle
` (8 preceding siblings ...)
2012-10-14 21:11 ` [Buildroot] [PATCH 09/10] glib-networking: remove redundant " Arnout Vandecappelle
@ 2012-10-14 21:11 ` Arnout Vandecappelle
2012-10-14 21:24 ` Yann E. MORIN
9 siblings, 1 reply; 24+ messages in thread
From: Arnout Vandecappelle @ 2012-10-14 21:11 UTC (permalink / raw)
To: buildroot
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/libsoup/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 57b425f..219f822 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBSOUP
depends on BR2_USE_WCHAR # glib2 and gnutls
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+ select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
libsoup is an HTTP client/server library. It uses GObject
and the GLib main loop, to integrate well with GNOME
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 10/10] libsoup: remove redundant dependency on gettext
2012-10-14 21:11 ` [Buildroot] [PATCH 10/10] libsoup: " Arnout Vandecappelle
@ 2012-10-14 21:24 ` Yann E. MORIN
2012-11-01 14:26 ` Arnout Vandecappelle
0 siblings, 1 reply; 24+ messages in thread
From: Yann E. MORIN @ 2012-10-14 21:24 UTC (permalink / raw)
To: buildroot
Arnout, All,
On Sunday 14 October 2012 Arnout Vandecappelle (Essensium/Mind) wrote:
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/libsoup/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
> index 57b425f..219f822 100644
> --- a/package/libsoup/Config.in
> +++ b/package/libsoup/Config.in
> @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBSOUP
> depends on BR2_USE_WCHAR # glib2 and gnutls
> select BR2_PACKAGE_LIBXML2
> select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
> help
> libsoup is an HTTP client/server library. It uses GObject
> and the GLib main loop, to integrate well with GNOME
Ditto the glib-networking patch: the subject is misleading. Change to
something like:
libsoup: only depends on gettext if locales are used
Or maybe you meant that gettext is needed by libglib2, not by libsoup
itself? In which case you want to remove the select altogether.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 24+ messages in thread