$NetBSD: patch-configure,v 1.7 2023/11/07 22:32:52 schmonz Exp $ - Remove hackaround for old OpenBSD bugs that break builds with other STL implementations. - Link directly with static-only libtclstub.a (fixes build on NetBSD). - Remove broken cross-compile check (builds a bundle, complains it can't run as executable) to fix lua-xapian on Big Sur. --- configure.orig 2023-11-06 04:30:33.000000000 +0000 +++ configure @@ -4713,51 +4713,6 @@ FILE *f = fopen ("conftest.out", "w"); return 0; } _ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } @@ -19438,7 +19393,7 @@ printf "%s\n" "not found" >&6; } for x in "/tcl$tcl_version" "" ; do TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh if test -r "$TCLCONFIG_SH" ; then - TCL_LIBS=`. $TCLCONFIG_SH && printf '%s' "$TCL_STUB_LIB_SPEC"` + TCL_LIBS=`. $TCLCONFIG_SH && printf '%s' "$TCL_BUILD_STUB_LIB_PATH"` break fi done @@ -21172,9 +21127,6 @@ SWIG_CXXFLAGS= if test yes = "$GXX" ; then SWIG_CXXFLAGS="-fno-strict-aliasing" - XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++" - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __INTEL_COMPILER