1From 4630e574e6c0269b94fd910e7c72b8ad1ee62ce7 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Wed, 3 Mar 2021 16:48:57 +0100
4Subject: [PATCH] configure.ac: fix static linking with magic
5
6Use SOX_FMT_PKG to retrieve magic dependencies (e.g. bzip2 or zlib)
7indeed -lz (i.e. ZLIB_LIBS) was wrongly removed by commit
86ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This will fix the following
9static build failure:
10
11configure:11677: checking for magic_open in -lmagic
12configure:11702: /srv/storage/autobuild/run/instance-0/output-1/host/bin/arm-linux-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os   -static -Wall -Wmissing-prototypes -Wstrict-prototypes  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -static -Wl,--as-needed conftest.c -lmagic    >&5
13conftest.c:53:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
14   53 | char magic_open ();
15      | ^~~~
16conftest.c:55:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
17   55 | main ()
18      | ^~~~
19/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /srv/storage/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompresszlib':
20compress.c:(.text+0x1d0): undefined reference to `inflateInit_'
21/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x1e4): undefined reference to `inflate'
22/srv/storage/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x1fc): undefined reference to `inflateEnd'
23
24Fixes:
25 - http://autobuild.buildroot.org/results/d96f27cd96926060046e2e1115777f5bceda3741
26
27Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
28[Upstream status: not sent yet (waiting for feedback on third patch)]
29---
30 configure.ac | 2 +-
31 1 file changed, 1 insertion(+), 1 deletion(-)
32
33diff --git a/configure.ac b/configure.ac
34index 896714f5..8ae3202c 100644
35--- a/configure.ac
36+++ b/configure.ac
37@@ -80,7 +80,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA])
38
39 dnl Various libraries
40
41-SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open])
42+SOX_FMT_PKG([magic], [libmagic])
43 SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress])
44 SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS])
45 SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS])
46--
472.30.1
48
49