From 3cc369dcbfcb48261c60887795d5e021344a70d3 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 2 Aug 2020 16:42:38 +0300 Subject: add patch for prefexed strings calls Signed-off-by: Mikle Kolyada --- 2020/patches/texlive-core-2020-strings.patch | 135 +++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 2020/patches/texlive-core-2020-strings.patch diff --git a/2020/patches/texlive-core-2020-strings.patch b/2020/patches/texlive-core-2020-strings.patch new file mode 100644 index 0000000..df96fd2 --- /dev/null +++ b/2020/patches/texlive-core-2020-strings.patch @@ -0,0 +1,135 @@ +--- a/libs/cairo/configure ++++ b/libs/cairo/configure +@@ -700,6 +700,7 @@ + build_TRUE + CAIRO_ATTRIBUTE_FLAG + VISIBILITY_CFLAGS ++STRINGS + LN_S + RANLIB + WARNING_CFLAGS +@@ -5673,10 +5686,104 @@ + 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 +--- a/libs/cairo/m4/float.m4 ++++ b/libs/cairo/m4/float.m4 +@@ -30,10 +30,13 @@ + + ]])], [ + +-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-65-gdbad