xref: /OK3568_Linux_fs/buildroot/package/sox/0004-configure.ac-fix-static-linking-with-magic.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593SmuzhiyunFrom 4630e574e6c0269b94fd910e7c72b8ad1ee62ce7 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3*4882a593SmuzhiyunDate: Wed, 3 Mar 2021 16:48:57 +0100
4*4882a593SmuzhiyunSubject: [PATCH] configure.ac: fix static linking with magic
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunUse SOX_FMT_PKG to retrieve magic dependencies (e.g. bzip2 or zlib)
7*4882a593Smuzhiyunindeed -lz (i.e. ZLIB_LIBS) was wrongly removed by commit
8*4882a593Smuzhiyun6ff0e9322f9891f5a6ac6c9b3bceffbfca16bec3. This will fix the following
9*4882a593Smuzhiyunstatic build failure:
10*4882a593Smuzhiyun
11*4882a593Smuzhiyunconfigure:11677: checking for magic_open in -lmagic
12*4882a593Smuzhiyunconfigure: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
13*4882a593Smuzhiyunconftest.c:53:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
14*4882a593Smuzhiyun   53 | char magic_open ();
15*4882a593Smuzhiyun      | ^~~~
16*4882a593Smuzhiyunconftest.c:55:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
17*4882a593Smuzhiyun   55 | main ()
18*4882a593Smuzhiyun      | ^~~~
19*4882a593Smuzhiyun/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':
20*4882a593Smuzhiyuncompress.c:(.text+0x1d0): undefined reference to `inflateInit_'
21*4882a593Smuzhiyun/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*4882a593Smuzhiyun/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*4882a593Smuzhiyun
24*4882a593SmuzhiyunFixes:
25*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/d96f27cd96926060046e2e1115777f5bceda3741
26*4882a593Smuzhiyun
27*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
28*4882a593Smuzhiyun[Upstream status: not sent yet (waiting for feedback on third patch)]
29*4882a593Smuzhiyun---
30*4882a593Smuzhiyun configure.ac | 2 +-
31*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
32*4882a593Smuzhiyun
33*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac
34*4882a593Smuzhiyunindex 896714f5..8ae3202c 100644
35*4882a593Smuzhiyun--- a/configure.ac
36*4882a593Smuzhiyun+++ b/configure.ac
37*4882a593Smuzhiyun@@ -80,7 +80,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA])
38*4882a593Smuzhiyun
39*4882a593Smuzhiyun dnl Various libraries
40*4882a593Smuzhiyun
41*4882a593Smuzhiyun-SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open])
42*4882a593Smuzhiyun+SOX_FMT_PKG([magic], [libmagic])
43*4882a593Smuzhiyun SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress])
44*4882a593Smuzhiyun SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS])
45*4882a593Smuzhiyun SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS])
46*4882a593Smuzhiyun--
47*4882a593Smuzhiyun2.30.1
48*4882a593Smuzhiyun
49