Skip to contentSkip to conversation

Pull request for branch yem-misc-fixes

GIT PULL New Yann E. MORIN 2 participants 5 messages Jan 8, 2013 – Jan 11, 2013

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

Hello All!

Here is a series to fix the autobuilder issues with dvb-apps.

Changes v1 -> v2:
- Fix libiconv dependency

The following changes since commit b0e63e5b9a736e70a24e156033663088b4a7f199:

package: add green end sftp server (2013-01-08 17:15:16 +0100)

are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem-misc-fixes

Yann E. MORIN (2):
package/dvb-apps: requires largefiles
package/dvb-apps: requires iconv

 package/dvb-apps/Config.in   |    5 +++++
 package/dvb-apps/dvb-apps.mk |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

Regards,
Yann E. MORIN

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH 1/2 package/dvb-apps: requires largefiles

Fixes (for example):

    http://autobuild.buildroot.net/results/5e12820c6537b176c49671a65afcbdb86c5154c9
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/dvb-apps/Config.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/dvb-apps/Config.in +4 -0
index 5d0b6f5..ca8dc54 100644
@@ -8,8 +8,12 @@ config BR2_PACKAGE_DVB_APPS
 
 if BR2_PACKAGE_DVB_APPS
 
+comment "dvb-apps utils needs LARGEFILE support in the toolchain"
+	depends on !BR2_LARGEFILE
+
 config BR2_PACKAGE_DVB_APPS_UTILS
 	bool "dvb-apps utilities"
+	depends on BR2_LARGEFILE
 	help
 	  A small number of DVB test and utility programs,
 	  including szap and dvbscan.
Signature · 1 line
1.7.2.5
author
#3 lore raw

PATCH 2/2 package/dvb-apps: requires iconv

In reply to Yann E. MORIN

Use libiconv if the toolchain does not have locales.

Fixes (for example):

    http://autobuild.buildroot.net/results/c5776c95ac128f7c7eadc2fe746ad89f8c1ef49a
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/dvb-apps/Config.in   |    1 +
 package/dvb-apps/dvb-apps.mk |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)
package/dvb-apps/Config.in +1 -0
index ca8dc54..7f76330 100644
@@ -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.
package/dvb-apps/dvb-apps.mk +2 -1
index f914799..a1ad0c4 100644
@@ -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
Signature · 1 line
1.7.2.5
#4 lore raw

PATCH 2/2 package/dvb-apps: requires iconv

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> 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" <[email protected]> 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?

Signature · 1 line
Bye, Peter Korsgaard