From 0c14fd18747b9f6fbbecb75ba8beef6d449c460a Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Sun, 6 Jan 2019 18:57:01 +0000 Subject: luatex 1.09.2; r-mpost alias of mpost -restricted git-svn-id: svn://tug.org/texlive/trunk@49614 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/luajit/LuaJIT-src/src/lj_alloc.c | 2 +- Build/source/libs/luajit/configure | 24 +++++++++++----------- Build/source/libs/luajit/configure.ac | 2 +- Build/source/libs/luajit/native/configure | 7 +++++-- Build/source/libs/luajit/native/configure.ac | 3 ++- 5 files changed, 21 insertions(+), 17 deletions(-) (limited to 'Build/source/libs/luajit') diff --git a/Build/source/libs/luajit/LuaJIT-src/src/lj_alloc.c b/Build/source/libs/luajit/LuaJIT-src/src/lj_alloc.c index 95d15d046ad..e482a834669 100644 --- a/Build/source/libs/luajit/LuaJIT-src/src/lj_alloc.c +++ b/Build/source/libs/luajit/LuaJIT-src/src/lj_alloc.c @@ -343,7 +343,7 @@ static void *CALL_MMAP(size_t size) } #endif -#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4 +#if ((defined(__FreeBSD__) && __FreeBSD__ < 10) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4 #include diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure index 56f4d0b75ff..1c0ad48d980 100755 --- a/Build/source/libs/luajit/configure +++ b/Build/source/libs/luajit/configure @@ -13755,9 +13755,9 @@ _ACEOF ac_configure_args="$ac_configure_args HOST_PTR_SIZE='$ac_cv_sizeof_void_p'" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 -$as_echo_n "checking for library containing sqrt... " >&6; } -if ${ac_cv_search_sqrt+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5 +$as_echo_n "checking for library containing pow... " >&6; } +if ${ac_cv_search_pow+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -13770,11 +13770,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char sqrt (); +char pow (); int main () { -return sqrt (); +return pow (); ; return 0; } @@ -13787,25 +13787,25 @@ for ac_lib in '' m; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_sqrt=$ac_res + ac_cv_search_pow=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_sqrt+:} false; then : + if ${ac_cv_search_pow+:} false; then : break fi done -if ${ac_cv_search_sqrt+:} false; then : +if ${ac_cv_search_pow+:} false; then : else - ac_cv_search_sqrt=no + ac_cv_search_pow=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 -$as_echo "$ac_cv_search_sqrt" >&6; } -ac_res=$ac_cv_search_sqrt +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pow" >&5 +$as_echo "$ac_cv_search_pow" >&6; } +ac_res=$ac_cv_search_pow if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" diff --git a/Build/source/libs/luajit/configure.ac b/Build/source/libs/luajit/configure.ac index 66cccbad459..f3e20d48159 100644 --- a/Build/source/libs/luajit/configure.ac +++ b/Build/source/libs/luajit/configure.ac @@ -33,7 +33,7 @@ KPSE_DLL_NAME([texluajit], [texluajit]) AC_CHECK_SIZEOF([void *]) ac_configure_args="$ac_configure_args HOST_PTR_SIZE='$ac_cv_sizeof_void_p'" -AC_SEARCH_LIBS([sqrt], [m]) +AC_SEARCH_LIBS([pow], [m]) AC_SEARCH_LIBS([dlopen], [dl]) KPSE_LUAJIT_DEFINES diff --git a/Build/source/libs/luajit/native/configure b/Build/source/libs/luajit/native/configure index cd3b9e8099d..7294da4c7a1 100755 --- a/Build/source/libs/luajit/native/configure +++ b/Build/source/libs/luajit/native/configure @@ -5142,8 +5142,11 @@ _ACEOF if test "x$ac_cv_sizeof_void_p" != "x$HOST_PTR_SIZE"; then : HOST_PTR_BITS=`expr 8 \* $HOST_PTR_SIZE` -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler BULDCC." >&5 -$as_echo "$as_me: WARNING: pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler BULDCC." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler LUAJITCROSSCOMPILER." >&5 +$as_echo "$as_me: WARNING: pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler LUAJITCROSSCOMPILER." >&2;} +if test "x$LUAJITCROSSCOMPILER" != x""; then : + CC=$LUAJITCROSSCOMPILER +fi case $HOST_PTR_BITS in #( 32|64) : CC="$CC -m$HOST_PTR_BITS"; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: trying: $CC" >&5 diff --git a/Build/source/libs/luajit/native/configure.ac b/Build/source/libs/luajit/native/configure.ac index ebb6d324dca..4d7940412e3 100644 --- a/Build/source/libs/luajit/native/configure.ac +++ b/Build/source/libs/luajit/native/configure.ac @@ -21,7 +21,8 @@ AC_PROG_LN_S AC_CHECK_SIZEOF([void *]) AS_IF([test "x$ac_cv_sizeof_void_p" != "x$HOST_PTR_SIZE"], [dnl HOST_PTR_BITS=`expr 8 \* $HOST_PTR_SIZE` -AC_MSG_WARN([pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler BULDCC.]) +AC_MSG_WARN([pointer size mismatch in cross-build; use a ${HOST_PTR_BITS}bit compiler LUAJITCROSSCOMPILER.]) +AS_IF([test "x$LUAJITCROSSCOMPILER" != x""],[CC=$LUAJITCROSSCOMPILER], []) AS_CASE([$HOST_PTR_BITS], [32|64], [CC="$CC -m$HOST_PTR_BITS"; AC_MSG_WARN([trying: $CC])])]) -- cgit v1.2.3