Permalink
Browse files

preparing luatex 1.08.0

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@6909 0b2b3880-5936-4365-a048-eb17d2e5a6bf
  • Loading branch information...
luigiScarso committed Aug 28, 2018
1 parent 48c36a5 commit 11d4dab3fe89f23bfcf4984b0323dae9f37cdf60
Showing 2,690 changed files with 131,427 additions and 827,106 deletions.
@@ -80,17 +80,13 @@ CONFHOST=
CONFBUILD=
JOBS_IF_PARALLEL=${JOBS_IF_PARALLEL:-3}
MAX_LOAD_IF_PARALLEL=${MAX_LOAD_IF_PARALLEL:-2}
STRIPBIN=
TARGET_CC=gcc
TARGET_TCFLAGS=

CFLAGS="$CFLAGS"
CXXFLAGS="$CXXFLAGS"

# poppler 0.55 needs c++11
# for the moment we put the flag here
# export CXXFLAGS="-std=c++11 $CXXFLAGS"


until [ -z "$1" ]; do
case "$1" in
--jit ) BUILDJIT=TRUE ;;
@@ -111,6 +107,7 @@ until [ -z "$1" ]; do
--host=* ) CONFHOST="$1" ;;
--build=* ) CONFBUILD="$1" ;;
--parallel ) MAKE="$MAKE -j $JOBS_IF_PARALLEL -l $MAX_LOAD_IF_PARALLEL" ;;
--stripbin=*) STRIPBIN="$1" ;;
--arch=* ) MACCROSS=TRUE; ARCH=`echo $1 | sed 's/--arch=\(.*\)/\1/' ` ;;
* ) echo "ERROR: invalid build.sh parameter: $1"; exit 1 ;;
esac
@@ -123,6 +120,10 @@ LUATEXEXEJIT=luajittex
LUATEXEXE=luatex
LUATEXEXE53=luatex53





case `uname` in
MINGW64* ) MINGW=TRUE ; LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
MINGW32* ) MINGW=TRUE ; LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
@@ -148,8 +149,8 @@ then
LUATEXEXE53=luatex53.exe
PATH=/usr/mingw32/bin:$PATH
PATH=`pwd`/extrabin/mingw:$PATH
CFLAGS="-mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CFLAGS"
CXXFLAGS="-mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CXXFLAGS"
CFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CFLAGS"
CXXFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CXXFLAGS"
: ${CONFHOST:=--host=x86_64-w64-mingw32}
: ${CONFBUILD:=--build=x86_64-unknown-linux-gnu}
RANLIB="${CONFHOST#--host=}-ranlib"
@@ -166,13 +167,13 @@ then
LUATEXEXE53=luatex53.exe
PATH=/usr/mingw32/bin:$PATH
PATH=`pwd`/extrabin/mingw:$PATH
CFLAGS="-m32 -mtune=nocona -g -O3 $CFLAGS"
CXXFLAGS="-m32 -mtune=nocona -g -O3 $CXXFLAGS"
CFLAGS="-Wno-unknown-pragmas -m32 -mtune=nocona -g -O3 $CFLAGS"
CXXFLAGS="-Wno-unknown-pragmas -m32 -mtune=nocona -g -O3 $CXXFLAGS"
: ${CONFHOST:=--host=i686-w64-mingw32}
: ${CONFBUILD:=--build=x86_64-unknown-linux-gnu}
RANLIB="${CONFHOST#--host=}-ranlib"
STRIP="${CONFHOST#--host=}-strip"
LDFLAGS="-Wl,--large-address-aware -Wl,--stack,2621440 $CFLAGS"
LDFLAGS="-Wl,--large-address-aware -Wl,--stack,2621440 -static-libgcc -static-libstdc++ $CFLAGS"
export CFLAGS CXXFLAGS LDFLAGS BUILDCXX BUILDCC
fi

@@ -207,6 +208,13 @@ fi
# fi


if [ "x$STRIPBIN" != "x" ]
then
STRIP="${STRIPBIN#--stripbin=}"
fi



if [ "$STRIP_LUATEX" = "FALSE" ]
then
export CFLAGS
@@ -239,14 +247,6 @@ if [ ! -r "$B" ]
then
mkdir "$B"
fi
#
# get a new svn version header
if [ "$WARNINGS" = "max" ]
then
rm -f source/texk/web2c/luatexdir/luatex_svnversion.h
fi
## Not used anymore
##( cd source ; ./texk/web2c/luatexdir/getluatexsvnversion.sh )


JITENABLE=
@@ -269,6 +269,8 @@ fi

cd "$B"

# --enable-dctdecoder=libjpeg --enable-libopenjpeg=openjpeg2 \

if [ "$ONLY_MAKE" = "FALSE" ]
then
TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
@@ -284,7 +286,6 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
$LUA52ENABLE $LUA53ENABLE $JITENABLE \
--without-system-ptexenc \
--without-system-kpathsea \
--without-system-poppler \
--without-system-xpdf \
--without-system-freetype \
--without-system-freetype2 \
@@ -294,8 +295,8 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
--without-system-zlib \
--without-system-t1lib \
--without-system-icu \
--without-system-graphite \
--without-system-harfbuzz \
--without-system-graphite \
--without-system-zziplib \
--without-mf-x-toolkit --without-x \
|| exit 1
@@ -312,7 +313,6 @@ $MAKE
(cd libs/zziplib; $MAKE all )
(cd libs/zlib; $MAKE all )
(cd libs/libpng; $MAKE all )
(cd libs/poppler; $MAKE all )
(cd texk; $MAKE web2c/Makefile)
(cd texk/kpathsea; $MAKE )
if [ "$BUILDJIT" = "TRUE" ]
111 build.sh
@@ -21,6 +21,7 @@
# Options:
# --jit : also build luajittex
# --nojit : don't build luajit
# --buildtag= : build directory <- 'build'-<tag>
# --make : only make, no make distclean; configure
# --parallel : make -j 8 -l 8.0
# --nostrip : do not strip binary
@@ -38,6 +39,9 @@
# --clang : use clang & clang++
# --debug : CFLAGS="-g -O0" --warnings=max --nostrip
# --debugopt : CFLAGS="-g -O3" --warnings=max --nostrip
# --musl : use musl libc (EXPERIMENTAL)
# --stripbin : strip program to use (default strip)
# --tlopt : option to pass to TeXLive configure
$DEBUG
#export CFLAGS="-D_FORTIFY_SOURCE=2 -O3"
#export CXXFLAGS="-D_FORTIFY_SOURCE=2 -O3"
@@ -68,6 +72,7 @@ fi
BUILDJIT=FALSE
BUILDLUA52=FALSE
BUILDLUA53=TRUE
BUILDTAG=
ONLY_MAKE=FALSE
STRIP_LUATEX=TRUE
WARNINGS=yes
@@ -82,36 +87,40 @@ JOBS_IF_PARALLEL=${JOBS_IF_PARALLEL:-8}
MAX_LOAD_IF_PARALLEL=${MAX_LOAD_IF_PARALLEL:-8}
TARGET_CC=gcc
TARGET_TCFLAGS=
STRIPBIN=
USEMUSL=FALSE
TEXLIVEOPT=

CFLAGS="$CFLAGS"
CXXFLAGS="$CXXFLAGS"

# poppler 0.55 needs c++11
# for the moment we put the flag here
# export CXXFLAGS="-std=c++11 $CXXFLAGS"

until [ -z "$1" ]; do
case "$1" in
--jit ) BUILDJIT=TRUE ;;
--nojit ) BUILDJIT=FALSE ;;
--make ) ONLY_MAKE=TRUE ;;
--nostrip ) STRIP_LUATEX=FALSE ;;
--debugopt ) STRIP_LUATEX=FALSE; WARNINGS=max ; CFLAGS="-O3 -g -ggdb3 $CFLAGS" ; CXXFLAGS="-O3 -g -ggdb $CXXFLAGS" ;;
--debug ) STRIP_LUATEX=FALSE; WARNINGS=max ; CFLAGS="-O0 -g -ggdb3 $CFLAGS" ; CXXFLAGS="-O0 -g -ggdb $CXXFLAGS" ;;
--clang ) export CC=clang; export CXX=clang++ ; TARGET_CC=$CC ; CLANG=TRUE ;;
--warnings=*) WARNINGS=`echo $1 | sed 's/--warnings=\(.*\)/\1/' ` ;;
--lua52 ) BUILDLUA52=TRUE ;;
--nolua52 ) BUILDLUA52=FALSE ;;
--lua53 ) BUILDLUA53=TRUE ;;
--nolua53 ) BUILDLUA53=FALSE ;;
--mingw ) MINGWCROSS=TRUE ;;
--mingw32 ) MINGWCROSS=TRUE ;;
--mingw64 ) MINGWCROSS64=TRUE ;;
--host=* ) CONFHOST="$1" ;;
--build=* ) CONFBUILD="$1" ;;
--parallel ) MAKE="$MAKE -j $JOBS_IF_PARALLEL -l $MAX_LOAD_IF_PARALLEL" ;;
--arch=* ) MACCROSS=TRUE; ARCH=`echo $1 | sed 's/--arch=\(.*\)/\1/' ` ;;
* ) echo "ERROR: invalid build.sh parameter: $1"; exit 1 ;;
--arch=* ) MACCROSS=TRUE; ARCH=`echo $1 | sed 's/--arch=\(.*\)/\1/' ` ;;
--build=* ) CONFBUILD="$1" ;;
--buildtag=* ) BUILDTAG="$1" ;;
--clang ) export CC=clang; export CXX=clang++ ; TARGET_CC=$CC ; CLANG=TRUE ;;
--debug ) STRIP_LUATEX=FALSE; WARNINGS=max ; CFLAGS="-O0 -g -ggdb3 $CFLAGS" ; CXXFLAGS="-O0 -g -ggdb3 $CXXFLAGS" ;;
--debugopt ) STRIP_LUATEX=FALSE; WARNINGS=max ; CFLAGS="-O3 -g -ggdb3 $CFLAGS" ; CXXFLAGS="-O3 -g -ggdb3 $CXXFLAGS" ;;
--host=* ) CONFHOST="$1" ;;
--jit ) BUILDJIT=TRUE ;;
--lua52 ) BUILDLUA52=TRUE ;;
--lua53 ) BUILDLUA53=TRUE ;;
--make ) ONLY_MAKE=TRUE ;;
--mingw ) MINGWCROSS=TRUE ;;
--mingw32 ) MINGWCROSS=TRUE ;;
--mingw64 ) MINGWCROSS64=TRUE ;;
--musl ) USEMUSL=TRUE ;;
--nojit ) BUILDJIT=FALSE ;;
--nolua52 ) BUILDLUA52=FALSE ;;
--nolua53 ) BUILDLUA53=FALSE ;;
--nostrip ) STRIP_LUATEX=FALSE ;;
--parallel ) MAKE="$MAKE -j $JOBS_IF_PARALLEL -l $MAX_LOAD_IF_PARALLEL" ;;
--stripbin=* ) STRIPBIN="$1" ;;
--tlopt=* ) TEXLIVEOPT=`echo $1 | sed 's/--tlopt=\(.*\)/\1/' ` ;;
--warnings=* ) WARNINGS=`echo $1 | sed 's/--warnings=\(.*\)/\1/' ` ;;
* ) echo "ERROR: invalid build.sh parameter: $1"; exit 1 ;;
esac
shift
done
@@ -123,19 +132,19 @@ LUATEXEXE=luatex
LUATEXEXE53=luatex53



case `uname` in
MINGW* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
MINGW64* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
MINGW32* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
CYGWIN* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
Darwin ) STRIP="strip -u -r" ;;
CYGWIN* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
Darwin ) STRIP="strip -u -r" ;;
MINGW* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
MINGW32* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
MINGW64* ) LUATEXEXEJIT=luajittex.exe ; LUATEXEXE=luatex.exe ; LUATEXEXE53=luatex53.exe ;;
esac

WARNINGFLAGS=--enable-compiler-warnings=$WARNINGS

B=build

## Useful for cross-compilation for ARM
if [ "x$CONFHOST" != "x" ]
then
B="build-$CONFHOST"
@@ -144,9 +153,15 @@ fi

if [ "$CLANG" = "TRUE" ]
then
B=build-clang
B="$B-clang"
fi

if [ "x$BUILDTAG" != "x" ]
then
B="${BUILDTAG#--buildtag=}"
fi


OLDPATH=$PATH
if [ "$MINGWCROSS64" = "TRUE" ]
then
@@ -156,8 +171,8 @@ then
LUATEXEXE53=luatex53.exe
PATH=/usr/mingw32/bin:$PATH
PATH=`pwd`/extrabin/mingw:$PATH
CFLAGS="-mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CFLAGS"
CXXFLAGS="-mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CXXFLAGS"
CFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CFLAGS"
CXXFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 -fno-lto -fno-use-linker-plugin $CXXFLAGS"
: ${CONFHOST:=--host=x86_64-w64-mingw32}
: ${CONFBUILD:=--build=x86_64-unknown-linux-gnu}
RANLIB="${CONFHOST#--host=}-ranlib"
@@ -174,8 +189,8 @@ then
LUATEXEXE53=luatex53.exe
PATH=/usr/mingw32/bin:$PATH
PATH=`pwd`/extrabin/mingw:$PATH
CFLAGS="-mtune=nocona -g -O3 $CFLAGS"
CXXFLAGS="-mtune=nocona -g -O3 $CXXFLAGS"
CFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 $CFLAGS"
CXXFLAGS="-Wno-unknown-pragmas -mtune=nocona -g -O3 $CXXFLAGS"
: ${CONFHOST:=--host=i686-w64-mingw32}
: ${CONFBUILD:=--build=x86_64-unknown-linux-gnu}
RANLIB="${CONFHOST#--host=}-ranlib"
@@ -206,6 +221,15 @@ then
export CFLAGS CXXFLAGS LDFLAGS
fi

if [ "$USEMUSL" = "TRUE" ]
then
TARGET_CC=musl-gcc
CC=musl-gcc
B="$B-musl"
LIBS="$LIBS -ldl"
export LIBS
fi


### Dirty trick to check Darwin X86_64
# TARGET_TESTARCH=$( ($TARGET_CC $TARGET_TCFLAGS -E source/libs/luajit/luajit-2.0.2/src/lj_arch.h -dM|grep -q LJ_TARGET_X64 && echo x64) || echo NO)
@@ -222,6 +246,12 @@ fi
# fi


if [ "x$STRIPBIN" != "x" ]
then
STRIP="${STRIPBIN#--stripbin=}"
fi


if [ "$STRIP_LUATEX" = "FALSE" ]
then
export CFLAGS
@@ -269,10 +299,10 @@ then
LUA53ENABLE=
fi


# --enable-dctdecoder=libjpeg --enable-libopenjpeg=openjpeg2 \
if [ "$ONLY_MAKE" = "FALSE" ]
then
TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
TL_MAKE=$MAKE ../source/configure $TEXLIVEOPT $CONFHOST $CONFBUILD $WARNINGFLAGS\
--enable-cxx-runtime-hack \
--enable-silent-rules \
--disable-all-pkgs \
@@ -288,7 +318,6 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
--without-system-pixman \
--without-system-ptexenc \
--without-system-kpathsea \
--without-system-poppler \
--without-system-xpdf \
--without-system-freetype \
--without-system-freetype2 \
@@ -298,13 +327,14 @@ TL_MAKE=$MAKE ../source/configure $CONFHOST $CONFBUILD $WARNINGFLAGS\
--without-system-zlib \
--without-system-t1lib \
--without-system-icu \
--without-system-graphite \
--without-system-harfbuzz \
--without-system-graphite \
--without-system-zziplib \
--without-mf-x-toolkit --without-x \
|| exit 1
fi


$MAKE

# the fact that these makes inside libs/ have to be done manually for the cross
@@ -316,7 +346,6 @@ $MAKE
(cd libs/zziplib; $MAKE all )
(cd libs/zlib; $MAKE all )
(cd libs/libpng; $MAKE all )
(cd libs/poppler; $MAKE all )
(cd texk; $MAKE web2c/Makefile)
(cd texk/kpathsea; $MAKE )
if [ "$BUILDJIT" = "TRUE" ]
@@ -378,10 +407,8 @@ then
fi
if [ "$BUILDLUA52" = "FALSE" ] && [ "$BUILDLUA53" = "TRUE" ]
then
mv "$B"/texk/web2c/$LUATEXEXE53 "$B"/texk/web2c/$LUATEXEXE
mv "$B"/texk/web2c/$LUATEXEXE53 "$B"/texk/web2c/$LUATEXEXE
ls -l "$B"/texk/web2c/$LUATEXEXE
fi




@@ -1,3 +1,7 @@
2018-04-28 Karl Berry <karl@tug.org>

* version.ac: 2019/dev.

2018-04-10 Karl Berry <karl@tug.org>

* README.*: update from new tlbuild.
@@ -126,9 +126,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/texk/texlive/ac/withenable.ac \
$(top_srcdir)/texk/texlive/ac/texlive.ac \
$(top_srcdir)/libs/zziplib/ac/withenable.ac \
$(top_srcdir)/libs/poppler/ac/withenable.ac \
$(top_srcdir)/libs/mpfr/ac/withenable.ac \
$(top_srcdir)/libs/gmp/ac/withenable.ac \
$(top_srcdir)/libs/libpng/ac/withenable.ac \
$(top_srcdir)/libs/luajit/ac/withenable.ac \
$(top_srcdir)/libs/lua52/ac/withenable.ac \
@@ -139,9 +136,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
$(top_srcdir)/libs/zlib/ac/zlib.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/gmp/ac/gmp.ac \
$(top_srcdir)/libs/mpfr/ac/mpfr.ac \
$(top_srcdir)/libs/poppler/ac/poppler.ac \
$(top_srcdir)/libs/zziplib/ac/zziplib.ac \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
Oops, something went wrong.

0 comments on commit 11d4dab

Please sign in to comment.