diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/libs/freetype2/ChangeLog | 7 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.am | 9 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.in | 9 | ||||
| -rwxr-xr-x | Build/source/libs/freetype2/configure | 5 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/configure.ac | 8 |
5 files changed, 25 insertions, 13 deletions
diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog index a2cd310e8bd..450b59d993c 100644 --- a/Build/source/libs/freetype2/ChangeLog +++ b/Build/source/libs/freetype2/ChangeLog @@ -1,3 +1,10 @@ +2021-01-03 Karl Berry <karl@freefriends.org> + + * Makefile.am (ft-config): pass --without-brotli, in hopes + of working around + https://tug.org/pipermail/tlbuild/2021q1/004768.html + * configure.ac: doc fix. + 2020-10-21 Akira Kakuto <kakuto@w32tex.org> Import freetype-2.10.4. diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 17752d43848..cff55cb1827 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -25,7 +25,9 @@ noinst_DATA = libfreetype.a # warns "file is not of required architecture", and does not read it. # There is no apparent reason for this. Using --without-zlib evidently # causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. +# be lost, even though it is not the cleanest solution. Similarly, don't +# incorporate other libraries which are not needed or are elsewhere in TL. +# They just complicate things. ft-config: rm -rf ft-build $(MKDIR_P) ft-build @@ -34,9 +36,10 @@ ft-config: $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --without-bzip2 \ - --without-zlib \ - --without-png \ + --without-brotli \ --without-harfbuzz \ + --without-png \ + --without-zlib \ --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index 475fe2b6f92..b71adf0346e 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -599,7 +599,9 @@ dist-hook: # warns "file is not of required architecture", and does not read it. # There is no apparent reason for this. Using --without-zlib evidently # causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. +# be lost, even though it is not the cleanest solution. Similarly, don't +# incorporate other libraries which are not needed or are elsewhere in TL. +# They just complicate things. ft-config: rm -rf ft-build $(MKDIR_P) ft-build @@ -608,9 +610,10 @@ ft-config: $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --without-bzip2 \ - --without-zlib \ - --without-png \ + --without-brotli \ --without-harfbuzz \ + --without-png \ + --without-zlib \ --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure index 85e4cdcbf7b..9c288facbd1 100755 --- a/Build/source/libs/freetype2/configure +++ b/Build/source/libs/freetype2/configure @@ -4355,7 +4355,8 @@ else fi -# pass explicit --host and --build, but nothing else? +# pass explicit --host and --build, but nothing else from here. +# Other unconditional options are passed from the Makefile[.am] here. if test "x$host" = x; then config_args= else @@ -4366,13 +4367,11 @@ if test "x$build" != x; then fi - FREETYPE_TREE=freetype-src ac_config_files="$ac_config_files Makefile" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/Build/source/libs/freetype2/configure.ac b/Build/source/libs/freetype2/configure.ac index f7a61878529..1e1e8aeb68e 100644 --- a/Build/source/libs/freetype2/configure.ac +++ b/Build/source/libs/freetype2/configure.ac @@ -1,6 +1,7 @@ +dnl $Id$ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright 2018 Karl Berry <tex-live@tug.org> +dnl Copyright 2018-2020 Karl Berry <tex-live@tug.org> dnl Copyright 2009-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder @@ -20,7 +21,8 @@ AC_PROG_CC AM_CONDITIONAL([build], [test "x$enable_build" != xno]) -# pass explicit --host and --build, but nothing else? +# pass explicit --host and --build, but nothing else from here. +# Other unconditional options are passed from the Makefile[.am] here. if test "x$host" = x; then config_args= else @@ -31,9 +33,7 @@ if test "x$build" != x; then fi AC_SUBST([config_args]) - AC_SUBST([FREETYPE_TREE], [freetype-src]) AC_CONFIG_FILES([Makefile]) - AC_OUTPUT |