diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-24 09:45:15 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-24 09:45:15 +0000 |
| commit | f351670d2b07232be80105fce207349e032ebd3c (patch) | |
| tree | 92914218958f62c108187bf4f6c269a5febc2636 | |
| parent | ecce9e2bab1bd6b4db775e832cb8e94db5de608b (diff) | |
libs/luajit: Build fix for cross compilation
git-svn-id: svn://tug.org/texlive/trunk@33038 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/libs/luajit/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/libs/luajit/configure | 10 | ||||
| -rw-r--r-- | Build/source/libs/luajit/m4/lj-system.m4 | 5 | ||||
| -rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 3 |
4 files changed, 21 insertions, 1 deletions
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog index 3f00d135d5a..179a931ebe4 100644 --- a/Build/source/libs/luajit/ChangeLog +++ b/Build/source/libs/luajit/ChangeLog @@ -1,3 +1,7 @@ +2014-02-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * m4/lj-system.m4: Define LUAJIT_OS for native/buildvm. + 2014-02-22 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Simplify. diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure index fc14873d6cb..1aa50311226 100755 --- a/Build/source/libs/luajit/configure +++ b/Build/source/libs/luajit/configure @@ -5332,6 +5332,16 @@ fi ;; #( *) : ;; esac +case $LJHOST in #( + Windows) : + echo '-DLUAJIT_OS=LUAJIT_OS_WINDOWS' >>native_flags ;; #( + Darwin | iOS) : + echo '-DLUAJIT_OS=LUAJIT_OS_OSX' >>native_flags ;; #( + Linux) : + echo '-DLUAJIT_OS=LUAJIT_OS_LINUX' >>native_flags ;; #( + *) : + echo '-DLUAJIT_OS=LUAJIT_OS_OTHER' >>native_flags ;; +esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LJHOST $LJARCH $DASM_ARCH" >&5 $as_echo "$LJHOST $LJARCH $DASM_ARCH" >&6; } diff --git a/Build/source/libs/luajit/m4/lj-system.m4 b/Build/source/libs/luajit/m4/lj-system.m4 index 3af3f5f4d86..d119fad6d04 100644 --- a/Build/source/libs/luajit/m4/lj-system.m4 +++ b/Build/source/libs/luajit/m4/lj-system.m4 @@ -74,6 +74,11 @@ AS_CASE([$LJARCH], [echo '-D GPR64' >>dynasm_flags]) AS_IF([test "x$LJHOST" = xPS3], [echo '-D PPE -D TOC' >>dynasm_flags])]) +AS_CASE([$LJHOST], + [Windows], [echo '-DLUAJIT_OS=LUAJIT_OS_WINDOWS' >>native_flags], + [Darwin | iOS], [echo '-DLUAJIT_OS=LUAJIT_OS_OSX' >>native_flags], + [Linux], [echo '-DLUAJIT_OS=LUAJIT_OS_LINUX' >>native_flags], + [echo '-DLUAJIT_OS=LUAJIT_OS_OTHER' >>native_flags]) AC_MSG_RESULT([$LJHOST $LJARCH $DASM_ARCH]) ]) # _LJ_ARCH diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index 7e5e18cd7df..7dbb4a74fad 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 31914 $'; +my $svnrev = '$Revision: 33021 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -350,6 +350,7 @@ sub platform_desc { 'sparc-solaris' => 'Sparc with Solaris', 'universal-darwin' => 'universal binaries for MacOSX/Darwin', 'win32' => 'Windows', + 'x86_64-cygwin' => 'x86_64 with Cygwin', 'x86_64-darwin' => 'x86_64 with MacOSX/Darwin', 'x86_64-linux' => 'x86_64 with GNU/Linux', 'x86_64-solaris' => 'x86_64 with Solaris', |