diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-antivirus/clamav/files | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'app-antivirus/clamav/files')
| -rw-r--r-- | app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch (renamed from app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch) | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch index 1a6303b5c8c2..ea39173c8ba1 100644 --- a/app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch +++ b/app-antivirus/clamav/files/clamav-0.102.1-libxml2_pkgconfig.patch @@ -1,8 +1,22 @@ -https://bugs.gentoo.org/661328 +From 25b9fccdae3a05561b6b7c9c82018a9a3dfec819 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 25 Nov 2019 15:54:09 +0100 +Subject: [PATCH] build: Use pkg-config to find libxml2 ---- clamav-0.102.0/m4/reorganization/libs/xml.m4 -+++ clamav-0.102.0/m4/reorganization/libs/xml.m4 -@@ -4,85 +4,29 @@ +Otherwise we get unneccesary linkage to icu and other unwanted stuff + +Bug: https://bugzilla.clamav.net/show_bug.cgi?id=12202 +Gentoo-bug: https://bugs.gentoo.org/661328 +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + m4/reorganization/libs/xml.m4 | 82 ++++++----------------------------- + 1 file changed, 13 insertions(+), 69 deletions(-) + +diff --git a/m4/reorganization/libs/xml.m4 b/m4/reorganization/libs/xml.m4 +index 24f0cfa92..d143e3a47 100644 +--- a/m4/reorganization/libs/xml.m4 ++++ b/m4/reorganization/libs/xml.m4 +@@ -4,85 +4,29 @@ AC_ARG_ENABLE([xml], [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], want_xml=$enableval, want_xml="auto") @@ -14,16 +28,8 @@ https://bugs.gentoo.org/661328 - AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library - @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), - [with_xml_val=$withval] -+ PKG_CHECK_MODULES([XML], [libxml-2.0], -+ [found_xml=yes], -+ [ -+ found_xml=no -+ AS_IF([test "x$want_xml" = xyes], -+ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] -+ ) -+ ] - ) - +- ) +- - AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], - [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], - [XML_HOME="$with_xml_val"]) @@ -74,7 +80,16 @@ https://bugs.gentoo.org/661328 - XML_LIBS="`$xmlconfig --libs`" - fi - esac -- ++ PKG_CHECK_MODULES([XML], [libxml-2.0], ++ [found_xml=yes], ++ [ ++ found_xml=no ++ AS_IF([test "x$want_xml" = xyes], ++ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] ++ ) ++ ] ++ ) + working_xml="no" if test "X$found_xml" != "Xno"; then - @@ -87,8 +102,9 @@ https://bugs.gentoo.org/661328 - + XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0) AC_MSG_CHECKING([for xmlreader.h in $readerresult]) - +- - if test ! -f "$readerresult"; then ++ + if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then AC_MSG_RESULT([not found]) else @@ -99,3 +115,6 @@ https://bugs.gentoo.org/661328 CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $XML_LIBS" +-- +2.24.0 + |