mirror of
https://git.busybox.net/buildroot.git
synced 2025-01-10 14:33:24 +08:00
package/tvheadend: bump version
Removed patch which was applied upstream. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
a18af4f8e0
commit
d5ca53da86
@ -1,34 +0,0 @@
|
||||
From 5cbf08213222cb507d365e6cbda87277f0b8f31e Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Fri, 14 Jun 2019 14:25:08 +0200
|
||||
Subject: [PATCH] Makefile: fix -pie linking according to --disable-pie
|
||||
|
||||
Only compilation follows './configure --disable-pie', linking instead
|
||||
doesn't, because '-pie' flag is passed to LDFLAGS uncoditionally.
|
||||
|
||||
So add '-pie' flag only if CONFIG_PIE=yes.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
Makefile | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 41783b546..4e5a947a3 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -62,7 +62,10 @@ LDFLAGS += -ldl -lm
|
||||
else
|
||||
LDFLAGS += -ldl -lpthread -lm
|
||||
endif
|
||||
-LDFLAGS += -pie -Wl,-z,now
|
||||
+ifeq ($(CONFIG_PIE),yes)
|
||||
+LDFLAGS += -pie
|
||||
+endif
|
||||
+LDFLAGS += -Wl,-z,now
|
||||
ifeq ($(CONFIG_LIBICONV),yes)
|
||||
LDFLAGS += -liconv
|
||||
endif
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 92c5f2cdda085b81fc50025afeb3ece74f60fae2b26f40a7dd07e227b0db2d9f tvheadend-17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead.tar.gz
|
||||
sha256 6a7703fbbe553a2d9f87acafc01162d81f78c6e427b8ab9c83242e1677248582 tvheadend-8f1de1621d78c91431238176bf4f6290870a031a.tar.gz
|
||||
sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TVHEADEND_VERSION = 17dff3e5ffbd67174b6c0d7b49f5488e19ec1ead
|
||||
TVHEADEND_VERSION = 8f1de1621d78c91431238176bf4f6290870a031a
|
||||
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
|
||||
TVHEADEND_LICENSE = GPL-3.0+
|
||||
TVHEADEND_LICENSE_FILES = LICENSE.md
|
||||
|
Loading…
Reference in New Issue
Block a user