diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-10-28 22:30:51 +0200 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-10-28 22:31:09 +0200 |
| commit | 22feb6cfb4d502a668287e6cada18bf52d418776 (patch) | |
| tree | 8e12af679466c742994a726957667f9eb72ff53b /dev-libs/libxslt/files | |
| parent | net-misc/wget: stable 1.19.1-r2 for sparc, bug #635496 (thanks to Rolf Eike B... (diff) | |
| download | gentoo-22feb6cfb4d502a668287e6cada18bf52d418776.tar.gz gentoo-22feb6cfb4d502a668287e6cada18bf52d418776.tar.bz2 gentoo-22feb6cfb4d502a668287e6cada18bf52d418776.zip | |
dev-libs/libxslt: Fix glibc-2.26 compatibility. Patch by Quentin Minster.
This patch is much less intrusive than the upstream solution, so using
it for now. Revision bump since the current version unconditionally includes
in public headers xlocale.h ...
Closes: https://bugs.gentoo.org/632214
Package-Manager: Portage-2.3.13, Repoman-2.3.4
Diffstat (limited to 'dev-libs/libxslt/files')
| -rw-r--r-- | dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch new file mode 100644 index 000000000000..e1e97229d60f --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch @@ -0,0 +1,32 @@ +diff --git a/configure.in b/configure.in +index d6aa366..20aafb8 100644 +--- a/configure.in ++++ b/configure.in +@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0 + XSLT_LOCALE_WINAPI=0 + + AC_CHECK_HEADERS([locale.h xlocale.h]) +-if test $ac_cv_header_xlocale_h = yes; then ++if test $ac_cv_header_locale_h = yes; then + dnl + dnl Check for generic locale_t declaration + dnl +-AC_MSG_CHECKING([if xlocale program link]) ++AC_MSG_CHECKING([if locale program link]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_LOCALE_H + #include <locale.h> +diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h +index 8a9ca15..2f64424 100644 +--- a/libxslt/xsltlocale.h ++++ b/libxslt/xsltlocale.h +@@ -17,7 +17,9 @@ + #ifdef XSLT_LOCALE_XLOCALE + + #include <locale.h> ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26 + #include <xlocale.h> ++#endif + + #ifdef __GLIBC__ + /*locale_t is defined only if _GNU_SOURCE is defined*/ |