Skip to contentSkip to conversation

package/minidlna: fix build with gcc 10

PATCH New Fabrice Fontaine 3 participants 4 messages Sep 1, 2020 – Sep 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/minidlna: fix build with gcc 10

Fixes:
- http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476

---
 .../minidlna/0001-fix-build-with-gcc-10.patch | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/minidlna/0001-fix-build-with-gcc-10.patch
package/minidlna/0001-fix-build-with-gcc-10.patch new file +49 -0
new file mode 100644
index 0000000000..521d17f0ca
@@ -0,0 +1,49 @@
+From 90e88764f0fb3d981cd0c3cfd07d63323cc64090 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Tue, 1 Sep 2020 22:55:24 +0200
+Subject: [PATCH] fix build with gcc 10
+
+Define setjmp_buffer as static to avoid the following build failure with
+gcc 10 (which defaults to -fno-common):
+
+/home/buildroot/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: image_utils.o:(.bss+0x0): multiple definition of `setjmp_buffer'; metadata.o:(.bss+0x0): first defined here
+collect2: error: ld returned 1 exit status
+
+Fixes:
+ - http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ image_utils.c | 2 +-
+ metadata.c    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/image_utils.c b/image_utils.c
+index 24cfd08..e8d9635 100644
+--- a/image_utils.c
++++ b/image_utils.c
+@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
+ 	src->pub.bytes_in_buffer = bufsize;
+ }
+ 
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ /* Don't exit on error like libjpeg likes to do */
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+diff --git a/metadata.c b/metadata.c
+index 9cd86dc..4781db7 100644
+--- a/metadata.c
++++ b/metadata.c
+@@ -502,7 +502,7 @@ GetAudioMetadata(const char *path, const char *name)
+ }
+ 
+ /* For libjpeg error handling */
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+ {
+-- 
+2.28.0
+
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/minidlna: fix build with gcc 10

Quoted 8 lines · On Tue, 1 Sep 2020 23:00:17 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476

---
 .../minidlna/0001-fix-build-with-gcc-10.patch | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/minidlna/0001-fix-build-with-gcc-10.patch

Applied to master, thanks. I suppose this fix was submitted upstream as well?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/minidlna: fix build with gcc 10

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Quoted 3 lines · On Tue, 1 Sep 2020 23:00:17 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476

Quoted 8 lines
Quoted 5 lines

---
.../minidlna/0001-fix-build-with-gcc-10.patch | 49 +++++++++++++++++++

1 file changed, 49 insertions(+)

create mode 100644 package/minidlna/0001-fix-build-with-gcc-10.patch

Applied to master, thanks. I suppose this fix was submitted upstream as well?

Committed to 2020.08.x, thanks.

If I am not mistaken, minidlna is pretty much dead upsteam.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 package/minidlna: fix build with gcc 10

Le sam. 5 sept. 2020 ? 10:32, Peter Korsgaard <[email protected]> a ?crit :

Quoted 15 lines
Quoted 14 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Quoted 8 lines · On Tue, 1 Sep 2020 23:00:17 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/8754bb4f7d749f999d5f8ddfec587470ceec4476

---
.../minidlna/0001-fix-build-with-gcc-10.patch | 49 +++++++++++++++++++

1 file changed, 49 insertions(+)

create mode 100644 package/minidlna/0001-fix-build-with-gcc-10.patch

Quoted 6 lines
Quoted 2 lines

Applied to master, thanks. I suppose this fix was submitted upstream as well?

Committed to 2020.08.x, thanks.

If I am not mistaken, minidlna is pretty much dead upsteam.

Indeed, minidlna is dead.
However, as requested by Thomas, I created a ticket here:
https://sourceforge.net/p/minidlna/patches/183.

Quoted 3 lines

--
Bye, Peter Korsgaard

Best Regards,

Fabrice