package/tvheadend: Rework CFLAGS handling for liburiparser

PATCH New Bernd Kuhls 3 participants 6 messages Dec 6, 2014 – Dec 7, 2014

lore

Share & tools

lore

Bernd Kuhls

author

2014-12-06 15:00 UTC #0 lore raw

PATCH 1/3 package/tvheadend: Rework CFLAGS handling for liburiparser

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tvheadend/tvheadend.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

package/tvheadend/tvheadend.mk +3 -2

index f593b3f..e0ce160 100644
@@ -32,9 +32,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
 
+TVHEADEND_CFLAGS = $(TARGET_CFLAGS)
 ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
 TVHEADEND_DEPENDENCIES += liburiparser
-TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)"
+TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 
 TVHEADEND_DEPENDENCIES += dtv-scan-tables

@@ -43,7 +44,7 @@ define TVHEADEND_CONFIGURE_CMDS
 	(cd $(@D);						\
 		$(TARGET_CONFIGURE_OPTS)			\
 		$(TARGET_CONFIGURE_ARGS)			\
-		$(TVHEADEND_CONF_ENV)				\
+		CFLAGS="$(TVHEADEND_CFLAGS)"			\
 		./configure					\
 			--prefix=/usr				\
 			--arch="$(ARCH)"			\

Signature · 1 line

1.7.10.4

Bernd Kuhls

author

2014-12-06 15:00 UTC #1 lore raw

PATCH 2/3 package/tvheadend: Fix inclusion of DVB frequency tables in bundled build

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tvheadend/tvheadend.mk |    3 +++
 1 file changed, 3 insertions(+)

package/tvheadend/tvheadend.mk +3 -0

index e0ce160..7d0ae08 100644
@@ -58,6 +58,9 @@ define TVHEADEND_CONFIGURE_CMDS
 endef
 
 define TVHEADEND_BUILD_CMDS
+	$(INSTALL) -d $(@D)/data/dvb-scan
+	cp -r $(TARGET_DIR)/usr/share/dvb/* $(@D)/data/dvb-scan/
+	touch $(@D)/data/dvb-scan/.stamp
 	$(MAKE) -C $(@D)
 endef

Signature · 1 line

1.7.10.4

Thomas Petazzoni

2014-12-06 15:24 UTC #2 lore raw

PATCH 2/3 package/tvheadend: Fix inclusion of DVB frequency tables in bundled build

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/tvheadend/tvheadend.mk |    3 +++
 1 file changed, 3 insertions(+)
package/tvheadend/tvheadend.mk +0 -0
index e0ce160..7d0ae08 100644

package/tvheadend/tvheadend.mk define TVHEADEND_CONFIGURE_CMDS · line 65

Quoted 8 lines

package/tvheadend/tvheadend.mk +3 -0

@@ -58,6 +58,9 @@ define TVHEADEND_CONFIGURE_CMDS
 endef
 
 define TVHEADEND_BUILD_CMDS
+	$(INSTALL) -d $(@D)/data/dvb-scan
+	cp -r $(TARGET_DIR)/usr/share/dvb/* $(@D)/data/dvb-scan/
+	touch $(@D)/data/dvb-scan/.stamp
 	$(MAKE) -C $(@D)
 endef

This probably needs a little comment in the code.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Bernd Kuhls

author

2014-12-06 15:00 UTC #3 lore raw

PATCH 3/3 package/tvheadend: Bump version

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tvheadend/tvheadend.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/tvheadend/tvheadend.mk +1 -1

index 7d0ae08..ebbca81 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = fcd16fa0d835d7fd4f57c350ed8b76350440c68c
+TVHEADEND_VERSION = 5ba389bd863cf144bdbdfc0e543a7c73470f0610
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md

Signature · 1 line

1.7.10.4

Yann E. MORIN

2014-12-07 20:12 UTC #4 lore raw

PATCH 1/3 package/tvheadend: Rework CFLAGS handling for liburiparser

In reply to Bernd Kuhls

Bernd, All,

On 2014-12-06 16:00 +0100, Bernd Kuhls spake thusly:

Quoted 4 lines

Suggested by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/100646
Signed-off-by Bernd Kuhls <[email protected]>

Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 36 lines

---
 package/tvheadend/tvheadend.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

package/tvheadend/tvheadend.mk +3 -2

index f593b3f..e0ce160 100644
@@ -32,9 +32,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
 
+TVHEADEND_CFLAGS = $(TARGET_CFLAGS)
 ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
 TVHEADEND_DEPENDENCIES += liburiparser
-TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)"
+TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 
 TVHEADEND_DEPENDENCIES += dtv-scan-tables

@@ -43,7 +44,7 @@ define TVHEADEND_CONFIGURE_CMDS
 	(cd $(@D);						\
 		$(TARGET_CONFIGURE_OPTS)			\
 		$(TARGET_CONFIGURE_ARGS)			\
-		$(TVHEADEND_CONF_ENV)				\
+		CFLAGS="$(TVHEADEND_CFLAGS)"			\
 		./configure					\
 			--prefix=/usr				\
 			--arch="$(ARCH)"			\

Signature · 6 lines

1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

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.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

Applied

2014-12-07 20:22 UTC #5 lore raw

PATCH 1/3 package/tvheadend: Rework CFLAGS handling for liburiparser

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

Suggested by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/100646
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/tvheadend/tvheadend.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com