summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-13 08:37:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-13 08:37:06 +0000
commitb9bd267a8fa9564a7328baf183b54bf85c1f2f5f (patch)
treede547b26862faf5167e879f2f3cc5c9e74fd90be
parent1ab81a0aa4acf1ffffa0b84ff87dab88a255166c (diff)
build system: Always use special flags when linking with libluajit on x64_64-darwin
git-svn-id: svn://tug.org/texlive/trunk@33168 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/README11
-rw-r--r--Build/source/libs/luajit/ChangeLog4
-rw-r--r--Build/source/libs/luajit/Makefile.am1
-rw-r--r--Build/source/libs/luajit/Makefile.in6
-rwxr-xr-xBuild/source/libs/luajit/configure8
-rw-r--r--Build/source/libs/luajit/include/Makefile.in1
-rw-r--r--Build/source/libs/luajit/native/Makefile.in13
-rwxr-xr-xBuild/source/libs/luajit/native/configure91
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-luajit-flags.m46
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst1
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rwxr-xr-xBuild/source/texk/web2c/configure17
-rw-r--r--Build/source/texk/web2c/configure.ac4
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in2
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in2
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am2
-rw-r--r--Build/source/texk/web2c/man/Makefile.in2
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in2
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in2
-rw-r--r--Build/source/texk/web2c/otps/win32/Makefile.in2
-rw-r--r--Build/source/texk/web2c/window/Makefile.in2
24 files changed, 166 insertions, 30 deletions
diff --git a/Build/source/README b/Build/source/README
index 6d8b8d46583..975e200cdb1 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -27,13 +27,13 @@ Prerequisites:
installed by default), for pdfopen and xdvi.
(Alternative: Build --without-x.)
-- libfontconfig (again both headers and library), for XeTeX and xdvipdfmx,
- except on MacOSX. (Alternative: Build --disable-xetex --disable-xdvipdfmx.)
+- libfontconfig (again both headers and library), for XeTeX,
+ except on MacOSX. (Alternative: Build --disable-xetex.)
While on MacOSX, an Objective C++ compiler is needed for XeTeX.
- If you modify any .y or .l source files, then Bison and Flex (or maybe
equivalents) are needed. The distributed .c and .h files are generated
- with bison-2.5 and flex-2.5.35.
+ with bison-3.0 and flex-2.5.37.
The binaries will be left in ./inst/bin/<stdplatform>.
For TeX Live, ignore the other files and directories that end up in ./inst.
@@ -56,7 +56,7 @@ env LD_OPTIONS=-R/usr/local/lib ./Build
Many more details about the TL build system, such as adding new
programs or libraries, recompiling after fixing problems, etc., are in
-the other README.* files here.
+doc/texlive.pdf and in the other README.* files here.
Build information for some of the platforms.
@@ -64,8 +64,7 @@ Build information for some of the platforms.
i386-linux: gcc 4.8.2, Linux 2.6.18-* (CentOS 5, tug.org)
~karl/bin/mybuild
-x86_64-linux: gcc 4.6.3, libc 2.3.6, Linux 2.6.28.6
- Using gcc-4.5.4 breaks mpost.
+x86_64-linux: gcc 4.8.2, libc 2.3.6, Linux 2.6.28.6
i386-solaris, x86_64-solaris: Solaris 10.
diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog
index 883a9d96eb2..44648397ff0 100644
--- a/Build/source/libs/luajit/ChangeLog
+++ b/Build/source/libs/luajit/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Use LUAJIT_LDEXTRA when linking the test program.
+
2014-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac, m4/lj-system.m4: Do not fail when
diff --git a/Build/source/libs/luajit/Makefile.am b/Build/source/libs/luajit/Makefile.am
index 655b2116d13..344e7f60f45 100644
--- a/Build/source/libs/luajit/Makefile.am
+++ b/Build/source/libs/luajit/Makefile.am
@@ -147,6 +147,7 @@ jittest_CPPFLAGS = -Iinclude
nodist_luajittry_SOURCES = @LUAJIT_TREE@/src/luajit.c
luajittry_CPPFLAGS = -Iinclude
+luajittry_LDFLAGS = $(LUAJIT_LDEXTRA)
LDADD = libluajit.a
diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in
index 19a99bc0741..95a7e95901c 100644
--- a/Build/source/libs/luajit/Makefile.in
+++ b/Build/source/libs/luajit/Makefile.in
@@ -189,6 +189,8 @@ nodist_luajittry_OBJECTS = \
luajittry_OBJECTS = $(nodist_luajittry_OBJECTS)
luajittry_LDADD = $(LDADD)
luajittry_DEPENDENCIES = libluajit.a
+luajittry_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(luajittry_LDFLAGS) \
+ $(LDFLAGS) -o $@
am__dist_check_SCRIPTS_DIST = luajit.test luajiterr.test
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -553,6 +555,7 @@ LJVM_MODE = @LJVM_MODE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_TREE = @LUAJIT_TREE@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -681,6 +684,7 @@ jittest_SOURCES = jittest.c
jittest_CPPFLAGS = -Iinclude
nodist_luajittry_SOURCES = @LUAJIT_TREE@/src/luajit.c
luajittry_CPPFLAGS = -Iinclude
+luajittry_LDFLAGS = $(LUAJIT_LDEXTRA)
LDADD = libluajit.a
# Reconfig
@@ -914,7 +918,7 @@ jittest$(EXEEXT): $(jittest_OBJECTS) $(jittest_DEPENDENCIES) $(EXTRA_jittest_DEP
luajittry$(EXEEXT): $(luajittry_OBJECTS) $(luajittry_DEPENDENCIES) $(EXTRA_luajittry_DEPENDENCIES)
@rm -f luajittry$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(luajittry_OBJECTS) $(luajittry_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(luajittry_LINK) $(luajittry_OBJECTS) $(luajittry_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure
index 329f141d7f3..48e2a2da176 100755
--- a/Build/source/libs/luajit/configure
+++ b/Build/source/libs/luajit/configure
@@ -601,6 +601,7 @@ PEOBJ_TRUE
DASM_ARCH
LJARCH
CPP
+LUAJIT_LDEXTRA
LUAJIT_DEFINES
LN_S
RANLIB
@@ -4845,6 +4846,13 @@ fi
LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+case $host_os:$host_cpu in #(
+ *darwin*:x86_64) :
+ LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000' ;; #(
+ *) :
+ ;;
+esac
+
# Check whether --enable-largefile was given.
if test "${enable_largefile+set}" = set; then :
diff --git a/Build/source/libs/luajit/include/Makefile.in b/Build/source/libs/luajit/include/Makefile.in
index f9de6d548d0..b7da7e8cceb 100644
--- a/Build/source/libs/luajit/include/Makefile.in
+++ b/Build/source/libs/luajit/include/Makefile.in
@@ -151,6 +151,7 @@ LJVM_MODE = @LJVM_MODE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_TREE = @LUAJIT_TREE@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in
index 4e90661f560..0fcb804df74 100644
--- a/Build/source/libs/luajit/native/Makefile.in
+++ b/Build/source/libs/luajit/native/Makefile.in
@@ -75,6 +75,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
EXTRA_PROGRAMS = buildvm$(EXEEXT) minilua$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@@ -86,6 +88,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
../../../build-aux/texinfo.tex ../../../build-aux/ylwrap \
../../../build-aux/ltmain.sh \
$(top_srcdir)/../../../build-aux/compile \
+ $(top_srcdir)/../../../build-aux/config.guess \
+ $(top_srcdir)/../../../build-aux/config.sub \
$(top_srcdir)/../../../build-aux/install-sh \
$(top_srcdir)/../../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -223,6 +227,7 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_TREE = @LUAJIT_TREE@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -253,14 +258,22 @@ am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
+build = @build@
build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+host = @host@
host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
diff --git a/Build/source/libs/luajit/native/configure b/Build/source/libs/luajit/native/configure
index 35f1d3b9b1a..954c7ab90cd 100755
--- a/Build/source/libs/luajit/native/configure
+++ b/Build/source/libs/luajit/native/configure
@@ -592,7 +592,16 @@ LIBOBJS
LUAJIT_TREE
DASM_ARCH
MATH_LIB
+LUAJIT_LDEXTRA
LUAJIT_DEFINES
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
LN_S
WARNING_CFLAGS
am__fastdepCC_FALSE
@@ -1297,6 +1306,10 @@ Program names:
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
_ACEOF
fi
@@ -4360,8 +4373,86 @@ $as_echo "no, using $LN_S" >&6; }
fi
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+case $host_os:$host_cpu in #(
+ *darwin*:x86_64) :
+ LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000' ;; #(
+ *) :
+ ;;
+esac
+
lj_save_LIBS=$LIBS
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index e328cc4bbe7..9825a74dca1 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-luajit-flags.m4 (KPSE_LUAJIT_DEFINES): Set LUAJIT_LDEXTRA
+ to the additional LDFLAGS for 64-bit Darwin.
+
2014-03-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-pkgs.m4 (kpse_texk_pkgs): Drop dvipdf-x.
diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4
index 5498d7158c3..996dca12e7e 100644
--- a/Build/source/m4/kpse-luajit-flags.m4
+++ b/Build/source/m4/kpse-luajit-flags.m4
@@ -20,6 +20,12 @@ _KPSE_LIB_FLAGS([luajit], [luajit], [tree],
# -------------------
# Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when
# compiling or using the `-lluajit' library.
+# Set the make variable LUAJIT_LDEXTRA to the LDFLAGS required when
+# linking with the `-lluajit' library.
AC_DEFUN([KPSE_LUAJIT_DEFINES], [dnl
+AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_SUBST([LUAJIT_DEFINES], [-DLUAJIT_ENABLE_LUA52COMPAT])
+AS_CASE([$host_os:$host_cpu],
+ [*darwin*:x86_64], [LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000'])
+AC_SUBST([LUAJIT_LDEXTRA])
]) # KPSE_LUAJIT_DEFINES
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 6286f7b7099..664a67d7d08 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -105,6 +105,7 @@ texcount/texcount.pl
texdef/texdef.pl
texdiff/texdiff
texdirflatten/texdirflatten
+texfot/texfot.pl
texlive/rungs.tlu
texlive/tlmgr.pl
texlive/updmap.pl
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 6e18add63ab..244f05ac200 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Use LUAJIT_LDEXTRA instead of luajittex_extra.
+
2014-02-23 Karl Berry <karl@tug.org>
* mftraptest,
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 203b1659ab6..98bbcfef923 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1859,6 +1859,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -1965,7 +1966,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -3178,7 +3178,7 @@ luajittex_ldadd = libluajittex.a libjitff.a libunilib.a \
libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) $(ZZIPLIB_LIBS) \
$(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS)
luatex_LDFLAGS = -export-dynamic
-luajittex_LDFLAGS = -export-dynamic $(luajittex_extra)
+luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs)
luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs)
luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index b7e3abc1463..a7973db6a5c 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -785,11 +785,11 @@ XETEX_MACOSX_TRUE
FONTCONFIG_LIBS
FONTCONFIG_INCLUDES
PKG_CONFIG
-luajittex_extra
ipc_socketlibs
lua_socketlibs
USE_DLOPEN_FALSE
USE_DLOPEN_TRUE
+LUAJIT_LDEXTRA
LUAJIT_DEFINES
LUA52_DEFINES
WIN32_CALL_FALSE
@@ -18662,6 +18662,13 @@ fi
LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+case $host_os:$host_cpu in #(
+ *darwin*:x86_64) :
+ LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000' ;; #(
+ *) :
+ ;;
+esac
+
LIBS=$kpse_save_LIBS
if test "x$kpse_cv_have_win32" = xno; then
@@ -19028,14 +19035,6 @@ fi
-case $host_os:$host_cpu in #(
- *darwin*:x86_64) :
- luajittex_extra='-pagezero_size 10000 -image_base 100000000' ;; #(
- *) :
- ;;
-esac
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X ApplicationServices framework" >&5
$as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; }
if ${kpse_cv_have_ApplicationServices+:} false; then :
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index ec7765c57c1..87e2ad500e5 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -142,10 +142,6 @@ AM_CONDITIONAL([USE_DLOPEN], [test "x$ac_cv_header_dlfcn_h" = xyes])
AC_SUBST([lua_socketlibs])
AC_SUBST([ipc_socketlibs])
-AS_CASE([$host_os:$host_cpu],
- [*darwin*:x86_64], [luajittex_extra='-pagezero_size 10000 -image_base 100000000'])
-AC_SUBST([luajittex_extra])
-
KPSE_CHECK_FRAMEWORK([ApplicationServices], [CTFontRef font])
KPSE_FONTCONFIG_FLAGS
AS_IF([test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no],
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 61332689462..cb95a644beb 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -299,6 +299,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -405,7 +406,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index f77967e4040..1aa34f9eadb 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -295,6 +295,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -401,7 +402,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 6c83202e817..d69efbc7b60 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/luatex.am: Use LUAJIT_LDEXTRA instead of luajittex_extra.
+
2014-03-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* luafilesystem/src/lfs.c: Avoid to redefine _O_TEXT, _O_BINARY.
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 123360311ee..a93f086185e 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -53,7 +53,7 @@ luajittex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS)
luajittex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS)
luatex_LDFLAGS = -export-dynamic
-luajittex_LDFLAGS = -export-dynamic $(luajittex_extra)
+luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs)
luajittex_LDADD = $(luajittex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs)
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 853e763854c..f99d413f97c 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -276,6 +276,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -382,7 +383,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 74e9c154d92..cb5ef6b5c83 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -521,6 +521,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -627,7 +628,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 4bfa6c8964f..5a44a78181d 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -560,6 +560,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -666,7 +667,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in
index 9a4bf796854..1ae7eac19e2 100644
--- a/Build/source/texk/web2c/otps/win32/Makefile.in
+++ b/Build/source/texk/web2c/otps/win32/Makefile.in
@@ -283,6 +283,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -389,7 +390,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index ab8f3f49e6f..f789e13eb06 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -293,6 +293,7 @@ LUA52_LIBS = @LUA52_LIBS@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_DEPEND = @LUAJIT_DEPEND@
LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
LUAJIT_LIBS = @LUAJIT_LIBS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -399,7 +400,6 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lua_socketlibs = @lua_socketlibs@
-luajittex_extra = @luajittex_extra@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@