[1/1] package/tvheadend: fix build error
diff mbox series

Message ID 20190706064236.30663-1-bernd.kuhls@t-online.de
State Accepted
Commit 0ed6e57a8d1da21fba695ded3137e2e3f3dd5490
Headers show
Series
  • [1/1] package/tvheadend: fix build error
Related show

Commit Message

Bernd Kuhls July 6, 2019, 6:42 a.m. UTC
Fixes
http://autobuild.buildroot.net/results/627/627e7080e655005d6724b9977670cc73059d6281/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0002-tvhcsa.c-include-stdio.h.patch       | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch

Comments

Thomas Petazzoni July 27, 2019, 8:37 p.m. UTC | #1
Hello Bernd,

On Sat,  6 Jul 2019 08:42:36 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> diff --git a/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch b/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch
> new file mode 100644
> index 0000000000..a1e80568fb
> --- /dev/null
> +++ b/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch
> @@ -0,0 +1,40 @@
> +From 693e3a3fe281dd618dd244b245c9bb0a00c7d893 Mon Sep 17 00:00:00 2001
> +From: Bernd Kuhls <bernd.kuhls@t-online.de>
> +Date: Sat, 6 Jul 2019 08:36:11 +0200
> +Subject: [PATCH] tvhcsa.c: include stdio.h
> +
> +Fixes uclibc build error:
> +
> +CC              src/descrambler/tvhcsa.o
> +In file included from /home/buildroot/autobuild/instance-0/output/build/tvheadend-8f1de1621d78c91431238176bf4f6290870a031a/src/tvhlog.h:30:0,
> +                 from src/descrambler/tvhcsa.h:30,
> +                 from src/descrambler/tvhcsa.c:19:
> +/home/buildroot/autobuild/instance-0/output/build/tvheadend-8f1de1621d78c91431238176bf4f6290870a031a/src/tvh_thread.h:163:25:
> + error: unknown type name '__do_not_use_pthread_mutex_t'
> + #define pthread_mutex_t __do_not_use_pthread_mutex_t
> +
> +detected by buildroot autobuilder:
> +http://autobuild.buildroot.net/results/627/627e7080e655005d6724b9977670cc73059d6281/
> +
> +Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1285
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Could you give a bit more details about how including <stdio.h> can
solve this build issue ? All this thread stuff in tvheadend isn't that
clear, and the fact that including <stdio.h> solves the build issue
makes it even less clear.

Thanks!

Thomas
Bernd Kuhls July 27, 2019, 8:44 p.m. UTC | #2
[posted and mailed]

Thomas Petazzoni <thomas.petazzoni@bootlin.com> 
wrote in news:20190727223753.2211ac3f@windsurf:

> Could you give a bit more details about how including <stdio.h> can
> solve this build issue ? All this thread stuff in tvheadend isn't that
> clear, and the fact that including <stdio.h> solves the build issue
> makes it even less clear.

Hi Thomas,

the fix was proposed by the author of tvheadend:
https://tvheadend.org/issues/5667#note-7

My knowledge about the code is not sufficient enough to answer your question, 
sorry. I was glad that the fix was as easy as adding a header include.

Regards, Bernd
Bernd Kuhls July 28, 2019, 8:56 a.m. UTC | #3
Am Sat, 27 Jul 2019 22:44:29 +0200 schrieb Bernd Kuhls:

> Thomas Petazzoni
> <thomas.petazzoni@bootlin.com> wrote in
> news:20190727223753.2211ac3f@windsurf:
> 
>> Could you give a bit more details about how including <stdio.h> can
>> solve this build issue ?
> 
> Hi Thomas,
> 
> the fix was proposed by the author of tvheadend:
> https://tvheadend.org/issues/5667#note-7

Hi Thomas,

one additional note: A similar patch was already accepted upstream: 
https://github.com/tvheadend/tvheadend/commit/
8f1de1621d78c91431238176bf4f6290870a031a

When sending this patch I forgot the optional dependency of libdvbcsa 
which causes the current build error and needs the same fix.

Regards, Bernd
Peter Korsgaard Aug. 1, 2019, 9:19 a.m. UTC | #4
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Am Sat, 27 Jul 2019 22:44:29 +0200 schrieb Bernd Kuhls:
 >> Thomas Petazzoni
 >> <thomas.petazzoni@bootlin.com> wrote in
 >> news:20190727223753.2211ac3f@windsurf:
 >> 
 >>> Could you give a bit more details about how including <stdio.h> can
 >>> solve this build issue ?
 >> 
 >> Hi Thomas,
 >> 
 >> the fix was proposed by the author of tvheadend:
 >> https://tvheadend.org/issues/5667#note-7

 > Hi Thomas,

 > one additional note: A similar patch was already accepted upstream: 
 > https://github.com/tvheadend/tvheadend/commit/
 > 8f1de1621d78c91431238176bf4f6290870a031a

 > When sending this patch I forgot the optional dependency of libdvbcsa 
 > which causes the current build error and needs the same fix.

Will you send a patch for that?
Peter Korsgaard Aug. 1, 2019, 9:19 a.m. UTC | #5
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes
 > http://autobuild.buildroot.net/results/627/627e7080e655005d6724b9977670cc73059d6281/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed, thanks.
Bernd Kuhls Aug. 1, 2019, 5:15 p.m. UTC | #6
Am Thu, 01 Aug 2019 11:19:37 +0200 schrieb Peter Korsgaard:

>>>>>> "Bernd" == Bernd Kuhls
>>>>>> <bernd.kuhls@t-online.de> writes:
> 
>  > When sending this patch I forgot the optional dependency of libdvbcsa
>  > which causes the current build error and needs the same fix.
> 
> Will you send a patch for that?

Hi Peter,

let me rephrase my sentence:

When sending the first patch[1] fixing tvheadend build errors I forgot 
the fact, that when the buildroot-supported optional dependency of 
libdvbcsa[2] is activated, additional files are compiled in tvheadend, 
one of them needed the patch I sent here.

If we are talking about the same topic I think no further patches should 
be needed atm ;)

Regards, Bernd

[1] http://patchwork.ozlabs.org/patch/1125591/
    This patch was superseded by the bump in
    http://patchwork.ozlabs.org/patch/1126475/
    which included my initial patch after it was committed upstream.

[2] https://git.buildroot.net/buildroot/tree/package/tvheadend/
tvheadend.mk#n66
Peter Korsgaard Aug. 1, 2019, 5:26 p.m. UTC | #7
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Am Thu, 01 Aug 2019 11:19:37 +0200 schrieb Peter Korsgaard:
 >>>>>>> "Bernd" == Bernd Kuhls
 >>>>>>> <bernd.kuhls@t-online.de> writes:
 >> 
 >> > When sending this patch I forgot the optional dependency of libdvbcsa
 >> > which causes the current build error and needs the same fix.
 >> 
 >> Will you send a patch for that?

 > Hi Peter,

 > let me rephrase my sentence:

 > When sending the first patch[1] fixing tvheadend build errors I forgot 
 > the fact, that when the buildroot-supported optional dependency of 
 > libdvbcsa[2] is activated, additional files are compiled in tvheadend, 
 > one of them needed the patch I sent here.

 > If we are talking about the same topic I think no further patches should 
 > be needed atm ;)

Ok, that wasn't clear to me.

Thanks.

Patch
diff mbox series

diff --git a/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch b/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch
new file mode 100644
index 0000000000..a1e80568fb
--- /dev/null
+++ b/package/tvheadend/0002-tvhcsa.c-include-stdio.h.patch
@@ -0,0 +1,40 @@ 
+From 693e3a3fe281dd618dd244b245c9bb0a00c7d893 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 6 Jul 2019 08:36:11 +0200
+Subject: [PATCH] tvhcsa.c: include stdio.h
+
+Fixes uclibc build error:
+
+CC              src/descrambler/tvhcsa.o
+In file included from /home/buildroot/autobuild/instance-0/output/build/tvheadend-8f1de1621d78c91431238176bf4f6290870a031a/src/tvhlog.h:30:0,
+                 from src/descrambler/tvhcsa.h:30,
+                 from src/descrambler/tvhcsa.c:19:
+/home/buildroot/autobuild/instance-0/output/build/tvheadend-8f1de1621d78c91431238176bf4f6290870a031a/src/tvh_thread.h:163:25:
+ error: unknown type name '__do_not_use_pthread_mutex_t'
+ #define pthread_mutex_t __do_not_use_pthread_mutex_t
+
+detected by buildroot autobuilder:
+http://autobuild.buildroot.net/results/627/627e7080e655005d6724b9977670cc73059d6281/
+
+Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1285
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/descrambler/tvhcsa.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/descrambler/tvhcsa.c b/src/descrambler/tvhcsa.c
+index 1deefc50f..e97c14e99 100644
+--- a/src/descrambler/tvhcsa.c
++++ b/src/descrambler/tvhcsa.c
+@@ -16,6 +16,7 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <stdio.h>
+ #include "tvhcsa.h"
+ #include "input.h"
+ #include "input/mpegts/tsdemux.h"
+-- 
+2.20.1
+