Skip to content

Commit

Permalink
synchronized texlive 51509.
Browse files Browse the repository at this point in the history
  • Loading branch information
clerkma committed Jun 30, 2019
1 parent 46a61ef commit 5bb2a5e
Show file tree
Hide file tree
Showing 60 changed files with 3,817 additions and 1,621 deletions.
9 changes: 4 additions & 5 deletions texlive/Build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# $Id: Build 51428 2019-06-23 17:20:20Z karl $
# $Id: Build 51486 2019-06-27 00:06:35Z preining $
# Public domain. Originally written many years ago by Sebastian Rahtz.
# The basic idea is to run configure && make, but with a multitude of
# environment variables to allow overriding everything.
Expand All @@ -15,6 +15,7 @@ LANG=C; export LANG
# cd to our source directory.
mydir=`dirname $0`
cd $mydir || exit 1
mydir=`pwd` # make absolute

# We export the TL_* variables so that they can be dumped to buildenv.log.
: ${TL_WORKDIR=Work}; export TL_WORKDIR
Expand Down Expand Up @@ -48,7 +49,7 @@ export MAKE; export TL_MAKE
: ${TL_MAKE_VERBOSE=VERBOSE=1}; export TL_MAKE_VERBOSE

# allow override of make target.
: ${TL_TARGET=world}; export TL_TARGTE
: ${TL_TARGET=world}; export TL_TARGET

if test "x$1" = x--no-clean; then
shift
Expand Down Expand Up @@ -114,9 +115,7 @@ cd $TL_WORKDIR || exit 1
echo "starting TeX Live build at `date`"
printf 'CMDLINE\t"%s"\n' "$0 $*"
printf 'PWD\t"%s"\n' "`pwd`"
#
# output system info (will also be done by make, to buildinfo.log).
$mydir/doc/buildinfo.sh --no-config-status
printf 'UNAME\t"%s"\n' "`uname`"
env | sort >buildenv.log
echo "See also buildenv.log and buildinfo.log in `pwd`"
echo
Expand Down
10 changes: 10 additions & 0 deletions texlive/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2019-06-25 Karl Berry <[email protected]>

* Build: don't call buildinfo from here, the output when the CC
etc. envvars are not set is too misleading. Just write UNAME.

2019-06-24 Karl Berry <[email protected]>

* doc/buildinfo.sh (compiler_version): new shell function;
ignore useless first "Configured:" line for gcc->cc on Macs.

2019-06-23 Karl Berry <[email protected]>

* doc/buildinfo.sh: output the compiler/other names
Expand Down
17 changes: 7 additions & 10 deletions texlive/build-aux/config.sub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2019 Free Software Foundation, Inc.

timestamp='2019-05-23'
timestamp='2019-06-26'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -337,17 +337,14 @@ case $1 in
basic_machine=m88k-harris
os=sysv3
;;
hp300)
hp300 | hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hp300bsd)
basic_machine=m68k-hp
os=bsd
;;
hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hppaosf)
basic_machine=hppa1.1-hp
os=osf
Expand All @@ -360,10 +357,6 @@ case $1 in
basic_machine=i386-mach
os=mach
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
isi68 | isi)
basic_machine=m68k-isi
os=sysv
Expand Down Expand Up @@ -612,6 +605,10 @@ case $1 in
basic_machine=vax-dec
os=vms
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
vxworks960)
basic_machine=i960-wrs
os=vxworks
Expand Down
8 changes: 4 additions & 4 deletions texlive/configure
Original file line number Diff line number Diff line change
Expand Up @@ -21683,11 +21683,11 @@ elif test "x$need_icu:$with_system_icu" = xyes:yes; then
as_fn_error $? "did not find either pkg-config or icu-config; one is required for system icu library support" "$LINENO" 5
fi

if $PKG_CONFIG harfbuzz-icu; then
HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags`
HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs`
if $PKG_CONFIG harfbuzz; then
HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz --cflags`
HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz --libs`
elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
as_fn_error $? "did not find harfbuzz-icu" "$LINENO" 5
as_fn_error $? "did not find harfbuzz" "$LINENO" 5
fi


Expand Down
21 changes: 15 additions & 6 deletions texlive/doc/buildinfo.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# $Id: buildinfo.sh 51428 2019-06-23 17:20:20Z karl $
# $Id: buildinfo.sh 51449 2019-06-24 22:12:32Z karl $
# Public domain. Report basics of current system; run from top-level
# Makefile so any make overrides will be taken into account. (And from
# Build.) buildenv.log with full environment dump is also created.
Expand All @@ -12,21 +12,30 @@ fi

printf 'UNAME\t"%s"\n' "`uname -a`"

# /etc/issue often contains only placeholders, so don't bother.
# /etc/issue often contains only placeholders, so don't bother with it.

# Return version identification for $1, by calling it with --version.
# gcc on Macs, when linked to cc, has a useless "Configured with:" as
# the first line. Likely we'll need to generalize for other compilers.
# We intentionally don't quote $1 in case CC was set to something like
# "cc --someopt".
compiler_version () {
$1 --version 2>&1 | grep -v '^Configured' | sed 1q
}

printf 'MAKE\t"%s"\n' "${MAKE-make}"
printf 'MAKE-v\t"%s"\n' "`${MAKE-make} -v 2>&1 | sed 1q`"
# BSD make does not give version info with -v, but the
# first line of the usage message is sort of an identifier.

# our configure defaults to using gcc and g++.
# our configure defaults to using gcc and g++, so we will too.
printf 'CC\t"%s"\n' "${CC-gcc}"
printf 'CFLAGS\t"%s"\n' "${CFLAGS}"
printf 'CC-v\t"%s"\n' "`${CC-gcc} --version 2>&1 | sed 1q`"
#
printf 'CC-v\t"%s"\n' "`compiler_version ${CC-gcc}`"
#
printf 'CXX\t"%s"\n' "${CXX-g++}"
printf 'CXXFLAGS\t"%s"\n' "${CXXFLAGS}"
printf 'CXX-v\t"%s"\n' "`${CXX-g++} --version 2>&1 | sed 1q`"
printf 'CXX-v\t"%s"\n' "`compiler_version ${CXX-g++}`"
#
printf 'OBJCXX\t"%s"\n' "${OBJCXX-cc}"
printf 'OBJCXXFLAGS\t"%s"\n' "${OBJCXXFLAGS}"
Expand Down
4 changes: 2 additions & 2 deletions texlive/libs/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 51414 2019-06-20 21:59:30Z kakuto $
$Id: README 51488 2019-06-27 08:20:17Z kakuto $
Public domain. Originally created by Karl Berry, 2005.

Libraries we compile for TeX Live.
Expand All @@ -25,7 +25,7 @@ graphite2 1.3.13 - checked 21dec18
http://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)

harfbuzz 2.5.2 - checked 21jun19
harfbuzz 2.5.3 - checked 27jun19
http://www.freedesktop.org/software/harfbuzz/release/

icu 63.1 - checked 8jan19
Expand Down
17 changes: 7 additions & 10 deletions texlive/libs/freetype2/freetype-src/builds/unix/config.sub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2019 Free Software Foundation, Inc.

timestamp='2019-05-23'
timestamp='2019-06-26'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -337,17 +337,14 @@ case $1 in
basic_machine=m88k-harris
os=sysv3
;;
hp300)
hp300 | hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hp300bsd)
basic_machine=m68k-hp
os=bsd
;;
hp300hpux)
basic_machine=m68k-hp
os=hpux
;;
hppaosf)
basic_machine=hppa1.1-hp
os=osf
Expand All @@ -360,10 +357,6 @@ case $1 in
basic_machine=i386-mach
os=mach
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
isi68 | isi)
basic_machine=m68k-isi
os=sysv
Expand Down Expand Up @@ -612,6 +605,10 @@ case $1 in
basic_machine=vax-dec
os=vms
;;
vsta)
basic_machine=i386-pc
os=vsta
;;
vxworks960)
basic_machine=i960-wrs
os=vxworks
Expand Down
5 changes: 5 additions & 0 deletions texlive/libs/harfbuzz/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2019-06-27 Akira Kakuto <[email protected]>

Import harfbuzz-2.5.3.
* version.ac, Makefile.am: Adjusted.

2019-06-21 Akira Kakuto <[email protected]>

Import harfbuzz-2.5.2.
Expand Down
3 changes: 2 additions & 1 deletion texlive/libs/harfbuzz/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## $Id: Makefile.am 51414 2019-06-20 21:59:30Z kakuto $
## $Id: Makefile.am 51488 2019-06-27 08:20:17Z kakuto $
## Proxy Makefile.am to build harfbuzz for TeX Live.
##
## Copyright 2016-2017 Karl Berry <[email protected]>
Expand Down Expand Up @@ -33,6 +33,7 @@ libharfbuzz_dependencies =
libharfbuzz_a_SOURCES = \
@HARFBUZZ_TREE@/src/hb-algs.hh \
@HARFBUZZ_TREE@/src/hb-atomic.hh \
@HARFBUZZ_TREE@/src/hb-bimap.hh \
@HARFBUZZ_TREE@/src/hb-blob.hh \
@HARFBUZZ_TREE@/src/hb-blob.cc \
@HARFBUZZ_TREE@/src/hb-buffer.hh \
Expand Down
3 changes: 2 additions & 1 deletion texlive/libs/harfbuzz/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,8 @@ AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \
libharfbuzz_dependencies = $(GRAPHITE2_DEPEND)
libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-algs.hh \
@HARFBUZZ_TREE@/src/hb-atomic.hh \
@HARFBUZZ_TREE@/src/hb-blob.hh @HARFBUZZ_TREE@/src/hb-blob.cc \
@HARFBUZZ_TREE@/src/hb-bimap.hh @HARFBUZZ_TREE@/src/hb-blob.hh \
@HARFBUZZ_TREE@/src/hb-blob.cc \
@HARFBUZZ_TREE@/src/hb-buffer.hh \
@HARFBUZZ_TREE@/src/hb-buffer-serialize.cc \
@HARFBUZZ_TREE@/src/hb-buffer.cc \
Expand Down
5 changes: 5 additions & 0 deletions texlive/libs/harfbuzz/TLpatches/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2019-06-27 Akira Kakuto <[email protected]>

Imported harfbuzz-2.5.3 source tree from:
http://www.freedesktop.org/software/harfbuzz/release/

2019-06-21 Akira Kakuto <[email protected]>

Imported harfbuzz-2.5.2 source tree from:
Expand Down
2 changes: 1 addition & 1 deletion texlive/libs/harfbuzz/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Changes applied to the harfbuzz-2.5.2/ tree as obtained from:
Changes applied to the harfbuzz-2.5.3/ tree as obtained from:
http://www.freedesktop.org/software/harfbuzz/release/

Removed:
Expand Down
24 changes: 12 additions & 12 deletions texlive/libs/harfbuzz/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.5.2.
# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 2.5.3.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='harfbuzz (TeX Live)'
PACKAGE_TARNAME='harfbuzz--tex-live-'
PACKAGE_VERSION='2.5.2'
PACKAGE_STRING='harfbuzz (TeX Live) 2.5.2'
PACKAGE_VERSION='2.5.3'
PACKAGE_STRING='harfbuzz (TeX Live) 2.5.3'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1311,7 +1311,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures harfbuzz (TeX Live) 2.5.2 to adapt to many kinds of systems.
\`configure' configures harfbuzz (TeX Live) 2.5.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1382,7 +1382,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.5.2:";;
short | recursive ) echo "Configuration of harfbuzz (TeX Live) 2.5.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1487,7 +1487,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
harfbuzz (TeX Live) configure 2.5.2
harfbuzz (TeX Live) configure 2.5.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2123,7 +2123,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by harfbuzz (TeX Live) $as_me 2.5.2, which was
It was created by harfbuzz (TeX Live) $as_me 2.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -4047,7 +4047,7 @@ fi

# Define the identity of the package.
PACKAGE='harfbuzz--tex-live-'
VERSION='2.5.2'
VERSION='2.5.3'


# Some tools Automake needs.
Expand Down Expand Up @@ -4241,8 +4241,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags

HB_VERSION_MAJOR=2
HB_VERSION_MINOR=5
HB_VERSION_MICRO=2
HB_VERSION=2.5.2
HB_VERSION_MICRO=3
HB_VERSION=2.5.3

ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
Expand Down Expand Up @@ -7919,7 +7919,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by harfbuzz (TeX Live) $as_me 2.5.2, which was
This file was extended by harfbuzz (TeX Live) $as_me 2.5.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -7985,7 +7985,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
harfbuzz (TeX Live) config.status 2.5.2
harfbuzz (TeX Live) config.status 2.5.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
3 changes: 2 additions & 1 deletion texlive/libs/harfbuzz/harfbuzz-src/CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ The pre-defined configurations are:
as esoteric or rarely-used shaping features. See the definition for details.

* `HB_TINY`: Enables both `HB_MINI` and `HB_LEAN` configurations, as well as
disabling thread-safety and debugging, and use size-optimized data tables.
disabling thread-safety and debugging, and use even more size-optimized data
tables.


## Tailoring configuration
Expand Down
Loading

0 comments on commit 5bb2a5e

Please sign in to comment.