From 880a20d28e5026e8366eaaa6d44659d2465252f6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Feb 2021 17:48:03 +0000 Subject: allow override of "strings" binary git-svn-id: svn://tug.org/texlive/trunk@58005 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/cairo/ChangeLog | 6 ++ Build/source/libs/cairo/Makefile.in | 1 + Build/source/libs/cairo/cairo/Makefile.in | 1 + Build/source/libs/cairo/configure | 99 ++++++++++++++++++++++++++++++- Build/source/libs/cairo/m4/float.m4 | 7 ++- 5 files changed, 110 insertions(+), 4 deletions(-) (limited to 'Build') diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index 523b843674d..14df7cf39d2 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,3 +1,9 @@ +2021-02-28 David Seifert + + * m4/float.m4: allow users to override 'strings', e.g., + with llvm-strings or for cross-compiling. + https://bugs.gentoo.org/730714 + 2020-05-18 Karl Berry * configure.ac ([m]): check for erf, not sqrt; the latter may diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index 316d486d1c7..c9c70d1252d 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -1010,6 +1010,7 @@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRINGS = @STRINGS@ STRIP = @STRIP@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ diff --git a/Build/source/libs/cairo/cairo/Makefile.in b/Build/source/libs/cairo/cairo/Makefile.in index 1026cb3cd36..921af7d4a72 100644 --- a/Build/source/libs/cairo/cairo/Makefile.in +++ b/Build/source/libs/cairo/cairo/Makefile.in @@ -187,6 +187,7 @@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRINGS = @STRINGS@ STRIP = @STRIP@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure index 4f849d961ab..708056b86ed 100755 --- a/Build/source/libs/cairo/configure +++ b/Build/source/libs/cairo/configure @@ -700,6 +700,7 @@ build_FALSE build_TRUE CAIRO_ATTRIBUTE_FLAG VISIBILITY_CFLAGS +STRINGS LN_S RANLIB WARNING_CFLAGS @@ -5668,10 +5669,104 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : -if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then +# allow users to override default 'strings' with 'llvm-strings' +# or ${CHOST}-strings. +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strings", so it can be a program name with args. +set dummy ${ac_tool_prefix}strings; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRINGS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRINGS"; then + ac_cv_prog_STRINGS="$STRINGS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRINGS="${ac_tool_prefix}strings" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRINGS=$ac_cv_prog_STRINGS +if test -n "$STRINGS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRINGS" >&5 +$as_echo "$STRINGS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRINGS"; then + ac_ct_STRINGS=$STRINGS + # Extract the first word of "strings", so it can be a program name with args. +set dummy strings; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRINGS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRINGS"; then + ac_cv_prog_ac_ct_STRINGS="$ac_ct_STRINGS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRINGS="strings" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRINGS=$ac_cv_prog_ac_ct_STRINGS +if test -n "$ac_ct_STRINGS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRINGS" >&5 +$as_echo "$ac_ct_STRINGS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRINGS" = x; then + STRINGS="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRINGS=$ac_ct_STRINGS + fi +else + STRINGS="$ac_cv_prog_STRINGS" +fi + +if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then ax_cv_c_float_words_bigendian=yes fi -if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then +if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then if test "$ax_cv_c_float_words_bigendian" = unknown; then ax_cv_c_float_words_bigendian=no else diff --git a/Build/source/libs/cairo/m4/float.m4 b/Build/source/libs/cairo/m4/float.m4 index 18ec3161840..3dc6317ff04 100644 --- a/Build/source/libs/cairo/m4/float.m4 +++ b/Build/source/libs/cairo/m4/float.m4 @@ -30,10 +30,13 @@ double d = 909042349670368103374704789055050114762116927356156320147971208440534 ]])], [ -if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then +# allow users to override default 'strings' with 'llvm-strings' +# or ${CHOST}-strings. +AC_CHECK_TOOL([STRINGS], [strings]) +if $STRINGS - conftest.$ac_objext | grep noonsees >/dev/null ; then ax_cv_c_float_words_bigendian=yes fi -if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then +if $STRINGS - conftest.$ac_objext | grep seesnoon >/dev/null ; then if test "$ax_cv_c_float_words_bigendian" = unknown; then ax_cv_c_float_words_bigendian=no else -- cgit v1.2.3