| Message ID | 57bb7483b3bae28b6dfb63a4faf6b81346b161f4.1357672284.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
Yann> Use libiconv if the toolchain does not have locales.
Yann> Fixes (for example):
Yann> http://autobuild.buildroot.net/results/c5776c95ac128f7c7eadc2fe746ad89f8c1ef49a
Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann> ---
Yann> package/dvb-apps/Config.in | 1 +
Yann> package/dvb-apps/dvb-apps.mk | 3 ++-
Yann> 2 files changed, 3 insertions(+), 1 deletions(-)
Yann> diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
Yann> index ca8dc54..7f76330 100644
Yann> --- a/package/dvb-apps/Config.in
Yann> +++ b/package/dvb-apps/Config.in
Yann> @@ -14,6 +14,7 @@ comment "dvb-apps utils needs LARGEFILE support in the toolchain"
Yann> config BR2_PACKAGE_DVB_APPS_UTILS
Yann> bool "dvb-apps utilities"
Yann> depends on BR2_LARGEFILE
Yann> + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
Yann> help
Yann> A small number of DVB test and utility programs,
Yann> including szap and dvbscan.
Yann> diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
Yann> index f914799..a1ad0c4 100644
Yann> --- a/package/dvb-apps/dvb-apps.mk
Yann> +++ b/package/dvb-apps/dvb-apps.mk
Yann> @@ -20,10 +20,11 @@ DVB_APPS_LICENSE = unknown (probably public domain)
Yann> ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
Yann> # Utilitiess are selected, build and install everything
Yann> +DVB_APPS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
Yann> DVB_APPS_INSTALL_STAGING = YES
Yann> define DVB_APPS_BUILD_CMDS
Yann> - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1
Yann> + $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -liconv" $(MAKE) -C $(@D) V=1
Ehh, that's wrong. You should only link against libiconv if we've built
it.
Care to fix and resend?
diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in index ca8dc54..7f76330 100644 --- a/package/dvb-apps/Config.in +++ b/package/dvb-apps/Config.in @@ -14,6 +14,7 @@ comment "dvb-apps utils needs LARGEFILE support in the toolchain" config BR2_PACKAGE_DVB_APPS_UTILS bool "dvb-apps utilities" depends on BR2_LARGEFILE + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help A small number of DVB test and utility programs, including szap and dvbscan. diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index f914799..a1ad0c4 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -20,10 +20,11 @@ DVB_APPS_LICENSE = unknown (probably public domain) ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y) # Utilitiess are selected, build and install everything +DVB_APPS_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) DVB_APPS_INSTALL_STAGING = YES define DVB_APPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1 + $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -liconv" $(MAKE) -C $(@D) V=1 endef define DVB_APPS_INSTALL_STAGING_CMDS
Use libiconv if the toolchain does not have locales. Fixes (for example): http://autobuild.buildroot.net/results/c5776c95ac128f7c7eadc2fe746ad89f8c1ef49a Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> --- package/dvb-apps/Config.in | 1 + package/dvb-apps/dvb-apps.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-)