summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/Makefile.am4
-rw-r--r--Build/source/Makefile.in3
-rwxr-xr-xBuild/source/configure57
-rw-r--r--Build/source/configure.ac4
4 files changed, 45 insertions, 23 deletions
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index 7257b9a539f..2569790aa76 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -54,6 +54,10 @@ world: all
@echo "make $@ done."
# Allow for skipping make check if needed.
+if cross_compiling
+check_target = skip
+else !cross_compiling
check_target = check
+endif !cross_compiling
skip:
.PHONY: skip
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index a0db735fb28..aa0d55aefc0 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -343,9 +343,10 @@ EXTRA_DIST = \
@build_kpathsea_FALSE@SUBDIRS = libs utils texk
@build_kpathsea_TRUE@SUBDIRS = texk/kpathsea libs utils texk
DIST_SUBDIRS = auxdir/auxsub texk/kpathsea libs utils texk
+@cross_compiling_FALSE@check_target = check
# Allow for skipping make check if needed.
-check_target = check
+@cross_compiling_TRUE@check_target = skip
all: all-recursive
.SUFFIXES:
diff --git a/Build/source/configure b/Build/source/configure
index 8661a6414b7..727daa2aff6 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -749,6 +749,8 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
subdirs
+cross_compiling_FALSE
+cross_compiling_TRUE
build_kpathsea_FALSE
build_kpathsea_TRUE
ICU_CONFIG
@@ -6903,13 +6905,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6906: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6908: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6909: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6911: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6912: output\"" >&5)
+ (eval echo "\"\$as_me:6914: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8112,7 +8114,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8115 "configure"' > conftest.$ac_ext
+ echo '#line 8117 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10042,11 +10044,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10045: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10047: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10049: \$? = $ac_status" >&5
+ echo "$as_me:10051: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10381,11 +10383,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10384: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10388: \$? = $ac_status" >&5
+ echo "$as_me:10390: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10486,11 +10488,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10489: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10491: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10493: \$? = $ac_status" >&5
+ echo "$as_me:10495: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10541,11 +10543,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10544: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10546: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10548: \$? = $ac_status" >&5
+ echo "$as_me:10550: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12908,7 +12910,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12911 "configure"
+#line 12913 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13004,7 +13006,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13007 "configure"
+#line 13009 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17478,11 +17480,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17481: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17483: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17485: \$? = $ac_status" >&5
+ echo "$as_me:17487: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17577,11 +17579,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17580: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17582: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17584: \$? = $ac_status" >&5
+ echo "$as_me:17586: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17629,11 +17631,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17634: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17636: \$? = $ac_status" >&5
+ echo "$as_me:17638: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19416,6 +19418,15 @@ else
fi
+ if test "x$cross_compiling" = xyes; then
+ cross_compiling_TRUE=
+ cross_compiling_FALSE='#'
+else
+ cross_compiling_TRUE='#'
+ cross_compiling_FALSE=
+fi
+
+
subdirs="$subdirs auxdir/auxsub texk/kpathsea libs utils texk"
@@ -19589,6 +19600,10 @@ if test -z "${build_kpathsea_TRUE}" && test -z "${build_kpathsea_FALSE}"; then
as_fn_error "conditional \"build_kpathsea\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${cross_compiling_TRUE}" && test -z "${cross_compiling_FALSE}"; then
+ as_fn_error "conditional \"cross_compiling\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
@@ -22054,7 +22069,7 @@ $as_echo "
** Configuration summary for $PACKAGE_STRING:
$msg_compiling" >&6; }
-case $kpse_bld$kpse_bld in
+case $kpse_src$kpse_bld in
*' '*) as_fn_error "Absolute source and/or build path with embedded spaces" "$LINENO" 5;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 4f73175ebc1..783b4ba1a9b 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -114,6 +114,8 @@ KPSE_RESTORE_FLAGS
AM_CONDITIONAL([build_kpathsea],
[test "x$need_kpathsea" = xyes && test "x$with_system_kpathsea" != xyes])
+AM_CONDITIONAL([cross_compiling], [test "x$cross_compiling" = xyes])
+
AC_CONFIG_SUBDIRS([auxdir/auxsub texk/kpathsea libs utils texk])
AC_CONFIG_FILES([Makefile])
@@ -142,7 +144,7 @@ AC_MSG_RESULT([
** Configuration summary for $PACKAGE_STRING:
$msg_compiling])
-case $kpse_bld$kpse_bld in
+case $kpse_src$kpse_bld in
*' '*) AC_MSG_ERROR([Absolute source and/or build path with embedded spaces]);;
esac
AC_MSG_RESULT([
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 03:43:37 +0000