0001-Add-libmagic.pc.patch 3.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. From d079cac1110cc2761417f0dcb0a142b217eb1eda Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 31 Jan 2020 20:26:29 +0100
  4. Subject: [PATCH] Add libmagic.pc
  5. libmagic can optionally depends on xz (for lzma) or bzip2 since version
  6. 5.38 and
  7. https://github.com/file/file/commit/b259a07ea95827f565faa20f0316e5b2704064f7
  8. so add libmagic.pc so package (such as gerbera) that links with libmagic
  9. will be able to use pkg-config to retrieve those static dependencies
  10. For example, this will avoid the following build failure:
  11. [100%] Linking CXX executable gerbera
  12. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/br-user/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmagic.a(compress.o): in function `uncompressbuf':
  13. compress.c:(.text+0x69c): undefined reference to `BZ2_bzDecompressInit'
  14. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x710): undefined reference to `BZ2_bzDecompress'
  15. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x730): undefined reference to `BZ2_bzDecompressEnd'
  16. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x7bc): undefined reference to `lzma_auto_decoder'
  17. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x828): undefined reference to `lzma_code'
  18. /home/br-user/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: compress.c:(.text+0x848): undefined reference to `lzma_end'
  19. Fixes:
  20. - http://autobuild.buildroot.org/results/37b1ef54dc41100689f311fbc31fc9300dc6ae63
  21. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  22. [Upstream status: https://bugs.astron.com/view.php?id=136]
  23. ---
  24. Makefile.am | 5 +++++
  25. configure.ac | 2 +-
  26. libmagic.pc.in | 10 ++++++++++
  27. 3 files changed, 16 insertions(+), 1 deletion(-)
  28. create mode 100644 libmagic.pc.in
  29. diff --git a/Makefile.am b/Makefile.am
  30. index 8bd927d9..2ab67ed7 100644
  31. --- a/Makefile.am
  32. +++ b/Makefile.am
  33. @@ -3,3 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
  34. EXTRA_DIST = MAINT
  35. SUBDIRS = src magic tests doc python
  36. +
  37. +# This variable must have 'exec' in its name, in order to be installed
  38. +# by 'install-exec' target (instead of default 'install-data')
  39. +pkgconfigexecdir = $(libdir)/pkgconfig
  40. +pkgconfigexec_DATA = libmagic.pc
  41. diff --git a/configure.ac b/configure.ac
  42. index ac37fccd..b2e2e5b8 100644
  43. --- a/configure.ac
  44. +++ b/configure.ac
  45. @@ -217,5 +217,5 @@ if test "$ac_cv_header_lzma_h$ac_cv_lib_lzma_lzma_stream_decoder" = "yesyes"; t
  46. AC_DEFINE([XZLIBSUPPORT], 1, [Enable xzlib compression support])
  47. fi
  48. -AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile])
  49. +AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile tests/Makefile doc/Makefile python/Makefile libmagic.pc])
  50. AC_OUTPUT
  51. diff --git a/libmagic.pc.in b/libmagic.pc.in
  52. new file mode 100644
  53. index 00000000..3ad1290b
  54. --- /dev/null
  55. +++ b/libmagic.pc.in
  56. @@ -0,0 +1,10 @@
  57. +prefix=@prefix@
  58. +exec_prefix=@exec_prefix@
  59. +libdir=@libdir@
  60. +includedir=@includedir@
  61. +
  62. +Name: libmagic
  63. +Description: Magic number recognition library
  64. +Version: @VERSION@
  65. +Libs: -L${libdir} -lmagic
  66. +Libs.private: @LIBS@
  67. --
  68. 2.24.1