From b9bd267a8fa9564a7328baf183b54bf85c1f2f5f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 13 Mar 2014 08:37:06 +0000 Subject: 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 --- Build/source/libs/luajit/ChangeLog | 4 ++ Build/source/libs/luajit/Makefile.am | 1 + Build/source/libs/luajit/Makefile.in | 6 +- Build/source/libs/luajit/configure | 8 +++ Build/source/libs/luajit/include/Makefile.in | 1 + Build/source/libs/luajit/native/Makefile.in | 13 ++++ Build/source/libs/luajit/native/configure | 91 ++++++++++++++++++++++++++++ 7 files changed, 123 insertions(+), 1 deletion(-) (limited to 'Build/source/libs/luajit') 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 + + * Makefile.am: Use LUAJIT_LDEXTRA when linking the test program. + 2014-03-10 Peter Breitenlohner * 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 -- cgit v1.2.3