diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/libs/luajit/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-04-NetBSD64-build | 13 | ||||
| -rw-r--r-- | Build/source/libs/luajit/LuaJIT-2.0.2/src/lj_alloc.c | 3 | ||||
| -rw-r--r-- | Build/source/libs/luajit/Makefile.in | 1 | ||||
| -rwxr-xr-x | Build/source/libs/luajit/configure | 8 | ||||
| -rw-r--r-- | Build/source/libs/luajit/configure.ac | 14 | ||||
| -rw-r--r-- | Build/source/libs/luajit/include/Makefile.in | 1 |
8 files changed, 29 insertions, 20 deletions
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog index 2baca0487d9..3f00d135d5a 100644 --- a/Build/source/libs/luajit/ChangeLog +++ b/Build/source/libs/luajit/ChangeLog @@ -1,3 +1,7 @@ +2014-02-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Simplify. + 2014-02-14 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, m4/lj-system.m4, native/Makefile.am: Simplify. diff --git a/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog b/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog index 7d3891277b3..32074fa2ab6 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog +++ b/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2014-02-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-NetBSD64-build (new): Fix NetBSD/amd64 build from + Marc Baudoin <babafou.eu.org>. + 2014-02-07 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-OSX-build (new): Backport from upstream git. diff --git a/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-04-NetBSD64-build b/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-04-NetBSD64-build new file mode 100644 index 00000000000..6fef9eaa22f --- /dev/null +++ b/Build/source/libs/luajit/LuaJIT-2.0.2-PATCHES/patch-04-NetBSD64-build @@ -0,0 +1,13 @@ +diff -ur -x lbitlib.c LuaJIT-2.0.2.orig/src/lj_alloc.c LuaJIT-2.0.2/src/lj_alloc.c +--- LuaJIT-2.0.2.orig/src/lj_alloc.c 2013-06-03 21:00:00.000000000 +0200 ++++ LuaJIT-2.0.2/src/lj_alloc.c 2014-02-23 14:10:01.000000000 +0100 +@@ -188,7 +188,8 @@ + return ptr; + } + +-#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__sun__) ++#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ ++ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun__) + + /* OSX and FreeBSD mmap() use a naive first-fit linear search. + ** That's perfect for us. Except that -pagezero_size must be set for OSX, diff --git a/Build/source/libs/luajit/LuaJIT-2.0.2/src/lj_alloc.c b/Build/source/libs/luajit/LuaJIT-2.0.2/src/lj_alloc.c index 8f285d174b9..93bf5a6e171 100644 --- a/Build/source/libs/luajit/LuaJIT-2.0.2/src/lj_alloc.c +++ b/Build/source/libs/luajit/LuaJIT-2.0.2/src/lj_alloc.c @@ -188,7 +188,8 @@ static LJ_AINLINE void *CALL_MMAP(size_t size) return ptr; } -#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__sun__) +#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ + defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun__) /* OSX and FreeBSD mmap() use a naive first-fit linear search. ** That's perfect for us. Except that -pagezero_size must be set for OSX, diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in index a57665315c8..af3541e88d1 100644 --- a/Build/source/libs/luajit/Makefile.in +++ b/Build/source/libs/luajit/Makefile.in @@ -523,7 +523,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ CYGPATH_W = @CYGPATH_W@ DASM_ARCH = @DASM_ARCH@ DEFS = @DEFS@ diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure index 6c02063186b..fc14873d6cb 100755 --- a/Build/source/libs/luajit/configure +++ b/Build/source/libs/luajit/configure @@ -590,7 +590,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -CROSS subdirs LUAJIT_TREE build_FALSE @@ -5387,13 +5386,6 @@ ac_config_files="$ac_config_files Makefile include/Makefile" subdirs="$subdirs native" -if test "x$cross_compiling" = xyes; then : - CROSS=$host- - -fi - - - cat >confcache <<\_ACEOF diff --git a/Build/source/libs/luajit/configure.ac b/Build/source/libs/luajit/configure.ac index 2b0bcda59bd..2bb7fe3a7c1 100644 --- a/Build/source/libs/luajit/configure.ac +++ b/Build/source/libs/luajit/configure.ac @@ -47,16 +47,12 @@ AC_CONFIG_FILES([Makefile include/Makefile]) AC_CONFIG_SUBDIRS([native]) -AS_IF([test "x$cross_compiling" = xyes], - [AC_SUBST([CROSS], [$host-])]) - -dnl Pass DASM_ARCH to the subdirectory native. -AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args DASM_ARCH=$DASM_ARCH"]) - -dnl The subdirectory native must be configured for the build system. +dnl Pass DASM_ARCH to the subdirectory native, +dnl which must be configured for the build system. dnl When cross compiling, can not share the cache file with the subdirectory! -AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], -[cache_file=/dev/null +AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args DASM_ARCH=$DASM_ARCH" +AS_IF([test "x$cross_compiling" = xyes], + [cache_file=/dev/null ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \ CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])]) diff --git a/Build/source/libs/luajit/include/Makefile.in b/Build/source/libs/luajit/include/Makefile.in index 8a3e8a42d92..f9de6d548d0 100644 --- a/Build/source/libs/luajit/include/Makefile.in +++ b/Build/source/libs/luajit/include/Makefile.in @@ -129,7 +129,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CROSS = @CROSS@ CYGPATH_W = @CYGPATH_W@ DASM_ARCH = @DASM_ARCH@ DEFS = @DEFS@ |