summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2016-01-23 09:21:52 +0000
committerSven Wegener <swegener@gentoo.org>2016-01-24 23:03:55 +0000
commita728d8583db95ba7dbe768bbc2e14dfcfed82709 (patch)
treedf1e06f81d3b3badfcc1d0289f345291097e4131 /media-tv/tvheadend/files
parentmedia-tv/tvheadend: Remove --mandir configure option (diff)
downloadgentoo-a728d8583db95ba7dbe768bbc2e14dfcfed82709.tar.gz
gentoo-a728d8583db95ba7dbe768bbc2e14dfcfed82709.tar.bz2
gentoo-a728d8583db95ba7dbe768bbc2e14dfcfed82709.zip
media-tv/tvheadend: Remove iconv patch and USE flag
The patch is wrong. The configure check only checks whether we need to link against libiconv for the iconv functions. iconv support is always activated and we need to unconditionally depend on virtual/libiconv. Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'media-tv/tvheadend/files')
-rw-r--r--media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
deleted file mode 100644
index 91187869a209..000000000000
--- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl <oliver@schinagl.nl>
-Date: Sat, 26 Sep 2015 22:36:08 +0200
-Subject: [PATCH] Use glibc version iconv
-
-Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
----
- Makefile | 2 +-
- configure | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07d6965..0ec0259 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ else
- LDFLAGS += -ldl -lpthread -lm
- endif
- ifeq ($(CONFIG_LIBICONV),yes)
--LDFLAGS += -liconv
-+LDFLAGS +=
- endif
- ifeq ($(PLATFORM), darwin)
- LDFLAGS += -framework CoreServices
-diff --git a/configure b/configure
-index 487456b..a6cce11 100755
---- a/configure
-+++ b/configure
-@@ -214,7 +214,7 @@ int test(void)
- iconv_t ic = iconv_open("ASCII", "ASCII");
- return 0;
- }
--' -liconv
-+'
-
- if enabled_or_auto dvben50221; then
- check_cc_snippet libdvben50221 '
---
-2.4.6
-