From bc8fc4fb761767ebd58343f78a2558a06dc381a2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 30 Apr 2019 19:25:07 -0700 Subject: [PATCH] tvheadend: Fix compilation on GCC8 New string warnings were introduced. Adding -Wno-error to TARGET_CFLAGS does not work so patch it out. Signed-off-by: Rosen Penev (cherry-picked from 9eea417e92f332e2c0a6b014655c0c5bbaebb48b) --- multimedia/tvheadend/Makefile | 4 +--- .../tvheadend/patches/020-strncpy-issue.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 multimedia/tvheadend/patches/020-strncpy-issue.patch diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index 4a41a9f38c..9108b92963 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tvheadend PKG_VERSION:=4.0.10 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)? @@ -72,8 +72,6 @@ CONFIGURE_ARGS += \ --disable-libav \ --enable-bundle -TARGET_CFLAGS += -Wno-error=pointer-compare - define Build/Prepare $(call Build/Prepare/Default) echo 'Tvheadend $(shell echo $(PKG_SOURCE_VERSION) | sed "s/^v//")~openwrt$(PKG_RELEASE)' \ diff --git a/multimedia/tvheadend/patches/020-strncpy-issue.patch b/multimedia/tvheadend/patches/020-strncpy-issue.patch new file mode 100644 index 0000000000..e9dc910670 --- /dev/null +++ b/multimedia/tvheadend/patches/020-strncpy-issue.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8c5e380..baef144 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ PROG := $(BUILDDIR)/tvheadend + # + + CFLAGS += -g -O2 -Wunused-result +-CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations ++#CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations + CFLAGS += -Wmissing-prototypes + CFLAGS += -fms-extensions -funsigned-char -fno-strict-aliasing + CFLAGS += -D_FILE_OFFSET_BITS=64 -- 2.30.2