forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-antivirus/clamav: Remove automagic dep on dev-libs/icu (again)
Bug: https://bugs.gentoo.org/661328 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Lars Wendler <[email protected]>
- Loading branch information
Lars Wendler
committed
Oct 14, 2019
1 parent
650d70e
commit f593e3c
Showing
2 changed files
with
102 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
app-antivirus/clamav/files/clamav-0.102.0-libxml2_pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
https://bugs.gentoo.org/661328 | ||
|
||
--- clamav-0.102.0/m4/reorganization/libs/xml.m4 | ||
+++ clamav-0.102.0/m4/reorganization/libs/xml.m4 | ||
@@ -4,85 +4,29 @@ | ||
[AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], | ||
want_xml=$enableval, want_xml="auto") | ||
|
||
-XML_HOME="" | ||
-xmlconfig="" | ||
if test "X$want_xml" != "Xno"; then | ||
- AC_MSG_CHECKING([for libxml2 installation]) | ||
- AC_ARG_WITH([xml], | ||
- 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"]) | ||
- | ||
- AS_IF([test "x$XML_HOME" != "x"], [ | ||
- AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""]) | ||
- ]) | ||
- | ||
- AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [ | ||
- AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"]) | ||
- ]) | ||
- | ||
- if test "x$XML_HOME" != "x"; then | ||
- AC_MSG_RESULT([$XML_HOME]) | ||
- with_xml="yes" | ||
- else | ||
- AC_MSG_RESULT([not found]) | ||
- fi | ||
- | ||
- found_xml="no" | ||
- XMLCONF_VERSION="" | ||
- XML_CPPFLAGS="" | ||
- XML_LIBS="" | ||
- case "$with_xml" in | ||
- yes) AC_PATH_PROG([xmlconfig], [xml2-config]) | ||
- if test "x$xmlconfig" = x ; then | ||
- AC_MSG_NOTICE([can not locate xml2-config in PATH, will search default XML_HOME variants]) | ||
- | ||
- if test "x$XML_HOME" != "x"; then | ||
- AC_MSG_CHECKING([xml2-config version]) | ||
- XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`" | ||
- | ||
- if test "x%XMLCONF_VERSION" != "x"; then | ||
- AC_MSG_RESULT([$XMLCONF_VERSION]) | ||
- found_xml="yes" | ||
- XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" | ||
- XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" | ||
- AS_ECHO("$XML_CPPFLAGS") | ||
- AS_ECHO("$XML_LIBS") | ||
- else | ||
- AC_MSG_ERROR([xml2-config failed]) | ||
- fi | ||
- fi | ||
- else | ||
- found_xml="yes" | ||
- XMLCONF_VERSION="`$xmlconfig --version`" | ||
- XML_CPPFLAGS="`$xmlconfig --cflags`" | ||
- XML_LIBS="`$xmlconfig --libs`" | ||
- fi | ||
- esac | ||
- | ||
working_xml="no" | ||
if test "X$found_xml" != "Xno"; then | ||
- | ||
- readerresult="" | ||
- if test "x$xmlconfig" = x ; then | ||
- readerresult="$XML_HOME/include/libxml2/libxml/xmlreader.h" | ||
- else | ||
- readerresult="`$xmlconfig --prefix`/include/libxml2/libxml/xmlreader.h" | ||
- fi | ||
- | ||
+ 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 | ||
AC_MSG_RESULT([found]) | ||
save_LIBS="$LIBS" | ||
save_CPPFLAGS="$CPPFLAGS" | ||
+ XML_CPPFLAGS="$XML_CFLAGS" | ||
CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" | ||
save_LDFLAGS="$LDFLAGS" | ||
LDFLAGS="$LDFLAGS $XML_LIBS" |