summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-06-13 21:11:50 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-06-13 21:13:00 +0100
commit75aebadc586d4bbce67e1bb948a10da28b5c703d (patch)
tree4490b881b992878be43a55db3560ef7e8b0b732a /x11-libs/cairo/files
parentsys-libs/pam: remove MULTILIB_USEDEP from virtual/pkgconfig (diff)
downloadgentoo-75aebadc586d4bbce67e1bb948a10da28b5c703d.tar.gz
gentoo-75aebadc586d4bbce67e1bb948a10da28b5c703d.tar.bz2
gentoo-75aebadc586d4bbce67e1bb948a10da28b5c703d.zip
x11-libs/cairo: detect 'strings' with AC_CHECK_TOOL
This way all binutils tools are detected with $CHOST prefix if exist. Fixes 64-bit build on sys-devel/binutils-config[-native-symlinks] system. Closes: https://bugs.gentoo.org/726200 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'x11-libs/cairo/files')
-rw-r--r--x11-libs/cairo/files/cairo-1.16.0-strings.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
new file mode 100644
index 000000000000..ee72f9dec7ce
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/726200
+--- a/build/aclocal.float.m4
++++ b/build/aclocal.float.m4
+@@ -31,10 +31,13 @@ int main() { return 0; }
+
+ ]])], [
+
+-if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
++# allow users to override default 'strings' with 'llvm-strings'
++# or ${CHOST}-strings.
++AC_CHECK_TOOL(STRINGS, strings)
++if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then
+ ax_cv_c_float_words_bigendian=yes
+ fi
+-if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
++if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
+ ax_cv_c_float_words_bigendian=no
+ else