Skip to contentSkip to conversation

package/transmission: fix build with UTP

PATCH New Fabrice Fontaine 2 participants 3 messages Oct 17, 2020 – Oct 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/transmission: fix build with UTP

Update first patch to fix build of transmission 3.00 with UTP

Fixes:
- http://autobuild.buildroot.org/results/bbfb61cf911fb29dcc02626f6eb47fff9e5e64f5

---
 package/transmission/0001-fix-utypes.patch | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
package/transmission/0001-fix-utypes.patch +4 -5
index 96403a6c36..e0bc633bd4 100644
@@ -6,10 +6,13 @@ The corresponding upstream bug report (unfixed) can be found here:
 https://trac.transmissionbt.com/ticket/5232
 
 Signed-off-by: Bernd Kuhls <[email protected]>
+[Fabrice: remove HAVE_STDBOOL_H as it is never defined since
+https://github.com/transmission/transmission/commit/f27596238d37f14477cc474c62c52eb53c4dcea6]
+Signed-off-by: Fabrice Fontaine <[email protected]>
 
 --- transmission-2.82.org/third-party/libutp/utypes.h	2013-08-09 04:47:43.000000000 +0200
 +++ transmission-2.82/third-party/libutp/utypes.h	2014-01-02 20:17:18.000000000 +0100
-@@ -35,8 +35,15 @@
+@@ -35,8 +35,11 @@
  typedef const char * cstr;
  typedef char * str;
  
@@ -20,11 +23,7 @@ Signed-off-by: Bernd Kuhls <[email protected]>
 +//typedef uint8 bool;
 +//#endif
 +#ifndef __cplusplus
-+#ifdef HAVE_STDBOOL_H
 +#include <stdbool.h>
-+#else
-+typedef uint8 bool;
-+#endif
 +#endif
  
  #endif //__UTYPES_H__
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/transmission: fix build with UTP

Fabrice, All,

On 2020-10-17 21:26 +0200, Fabrice Fontaine spake thusly:

Quoted 30 lines

Update first patch to fix build of transmission 3.00 with UTP

Fixes:
- http://autobuild.buildroot.org/results/bbfb61cf911fb29dcc02626f6eb47fff9e5e64f5

---
 package/transmission/0001-fix-utypes.patch | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
package/transmission/0001-fix-utypes.patch +4 -1
index 96403a6c36..e0bc633bd4 100644
@@ -6,10 +6,13 @@ The corresponding upstream bug report (unfixed) can be found here:
 https://trac.transmissionbt.com/ticket/5232
 
 Signed-off-by: Bernd Kuhls <[email protected]>
+[Fabrice: remove HAVE_STDBOOL_H as it is never defined since
+https://github.com/transmission/transmission/commit/f27596238d37f14477cc474c62c52eb53c4dcea6]
+Signed-off-by: Fabrice Fontaine <[email protected]>
 
 --- transmission-2.82.org/third-party/libutp/utypes.h	2013-08-09 04:47:43.000000000 +0200
 +++ transmission-2.82/third-party/libutp/utypes.h	2014-01-02 20:17:18.000000000 +0100
-@@ -35,8 +35,15 @@
+@@ -35,8 +35,11 @@
  typedef const char * cstr;
  typedef char * str;
 

package/transmission/0001-fix-utypes.patch Signed-off-by: Bernd Kuhls <[email protected]> · line 27

Quoted 8 lines
package/transmission/0001-fix-utypes.patch +0 -4
@@ -20,11 +23,7 @@ Signed-off-by: Bernd Kuhls <[email protected]>
 +//typedef uint8 bool;
 +//#endif
 +#ifndef __cplusplus
-+#ifdef HAVE_STDBOOL_H
 +#include <stdbool.h>
-+#else
-+typedef uint8 bool;
-+#endif

If HAVE_STDBOOL_H is never defined, then presumably we always take the else clause path, no?

Regards,
Yann E. MORIN.

Quoted 10 lines
package/transmission/0001-fix-utypes.patch +0 -0
 +#endif
 
  #endif //__UTYPES_H__
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/transmission: fix build with UTP

Le sam. 17 oct. 2020 ? 23:52, Yann E. MORIN <[email protected]> a ?crit :

Quoted 33 lines

Fabrice, All,

On 2020-10-17 21:26 +0200, Fabrice Fontaine spake thusly:

Quoted 29 lines

Update first patch to fix build of transmission 3.00 with UTP

Fixes:
- http://autobuild.buildroot.org/results/bbfb61cf911fb29dcc02626f6eb47fff9e5e64f5

---
 package/transmission/0001-fix-utypes.patch | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
package/transmission/0001-fix-utypes.patch +4 -1
index 96403a6c36..e0bc633bd4 100644
@@ -6,10 +6,13 @@ The corresponding upstream bug report (unfixed) can be found here:
 https://trac.transmissionbt.com/ticket/5232
 
 Signed-off-by: Bernd Kuhls <[email protected]>
+[Fabrice: remove HAVE_STDBOOL_H as it is never defined since
+https://github.com/transmission/transmission/commit/f27596238d37f14477cc474c62c52eb53c4dcea6]
+Signed-off-by: Fabrice Fontaine <[email protected]>
 
 --- transmission-2.82.org/third-party/libutp/utypes.h        2013-08-09 04:47:43.000000000 +0200
 +++ transmission-2.82/third-party/libutp/utypes.h    2014-01-02 20:17:18.000000000 +0100
-@@ -35,8 +35,15 @@
+@@ -35,8 +35,11 @@
  typedef const char * cstr;
  typedef char * str;
 
Quoted 12 lines

package/transmission/0001-fix-utypes.patch Signed-off-by: Bernd Kuhls <[email protected]> · line 27

Quoted 9 lines
package/transmission/0001-fix-utypes.patch +0 -4
@@ -20,11 +23,7 @@ Signed-off-by: Bernd Kuhls <[email protected]>
 +//typedef uint8 bool;
 +//#endif
 +#ifndef __cplusplus
-+#ifdef HAVE_STDBOOL_H
 +#include <stdbool.h>
-+#else
-+typedef uint8 bool;
-+#endif

If HAVE_STDBOOL_H is never defined, then presumably we always take the else clause path, no?

Yes, we always take the else clause path and this is the root cause of the build failure with transmission 3.00.
transmission 3.00 unconditionally includes stdbool.h so our patch on libutp must also include it unconditionally instead of defining it to uint8 if HAVE_STDBOOL_H is not defined.

Quoted 15 lines

Regards,
Yann E. MORIN.

Quoted 10 lines
package/transmission/0001-fix-utypes.patch +0 -1
 +#endif
 
  #endif //__UTYPES_H__
--

2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 7 lines

--
.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Best Regards,

Fabrice