Skip to contentSkip to conversation

package/tvheadend: Fix static build

PATCH Superseded Bernd Kuhls 2 participants 2 messages Aug 25, 2015

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/tvheadend: Fix static build

Fixes
http://autobuild.buildroot.net/results/bd0/bd0e8619df7cd8f21da96ae470691b1ebb2f156c/
http://autobuild.buildroot.net/results/f1c/f1c40ac9dda5ceeb5665d021333058eb29828d62/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/tvheadend/tvheadend.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/tvheadend/tvheadend.mk +8 -0
index ec04e6f..e145ded 100644
@@ -71,6 +71,14 @@ define TVHEADEND_CONFIGURE_CMDS
 	)
 endef
 
+# remove hardcoded -ldl for static builds
+define TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD
+	$(SED) 's/-ldl -lpthread -lm/-lpthread -lm/' $(@D)/Makefile
+endef
+ifeq ($(BR2_STATIC_LIBS),y)
+TVHEADEND_POST_CONFIGURE_HOOKS += TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD
+endif
+
 define TVHEADEND_BUILD_CMDS
 	$(MAKE) -C $(@D)
 endef
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 package/tvheadend: Fix static build

Hi Bernd,

Quoted 14 lines

Fixes
http://autobuild.buildroot.net/results/bd0/bd0e8619df7cd8f21da96ae470691b1ebb2f156c/
http://autobuild.buildroot.net/results/f1c/f1c40ac9dda5ceeb5665d021333058eb29828d62/

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

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

Quoted 10 lines
package/tvheadend/tvheadend.mk +7 -0
@@ -71,6 +71,14 @@ define TVHEADEND_CONFIGURE_CMDS
  	)
  endef
 
+# remove hardcoded -ldl for static builds
+define TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD
+	$(SED) 's/-ldl -lpthread -lm/-lpthread -lm/' $(@D)/Makefile
+endef
+ifeq ($(BR2_STATIC_LIBS),y)
+TVHEADEND_POST_CONFIGURE_HOOKS += TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD
+endif

This should rather be:

ifeq ($(BR2_STATIC_LIBS),y)
define TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD

	$(SED) 's/-ldl -lpthread -lm/-lpthread -lm/' $(@D)/Makefile

endef
TVHEADEND_POST_CONFIGURE_HOOKS += TVHEADEND_FIX_MAKEFILE_FOR_STATIC_BUILD endif

Regards,
Jerzy

Quoted 4 lines
package/tvheadend/tvheadend.mk +1 -0
+
  define TVHEADEND_BUILD_CMDS
  	$(MAKE) -C $(@D)
  endef