summaryrefslogtreecommitdiff
path: root/Build/source/texk
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 /Build/source/texk
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
Diffstat (limited to 'Build/source/texk')
-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
14 files changed, 27 insertions, 23 deletions
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@