texlive[57320] force --without-brotli for freetype config

[commits+karl at tug.org]

Revision: 57320
          http://tug.org/svn/texlive?view=revision&revision=57320
Author:   karl
Date:     2021-01-04 01:01:15 +0100 (Mon, 04 Jan 2021)
Log Message:
-----------
force --without-brotli for freetype config

Modified Paths:
--------------
    trunk/Build/source/libs/freetype2/ChangeLog
    trunk/Build/source/libs/freetype2/Makefile.am
    trunk/Build/source/libs/freetype2/Makefile.in
    trunk/Build/source/libs/freetype2/configure
    trunk/Build/source/libs/freetype2/configure.ac

Property Changed:
----------------
    trunk/Build/source/libs/freetype2/configure.ac

Modified: trunk/Build/source/libs/freetype2/ChangeLog
===================================================================
--- trunk/Build/source/libs/freetype2/ChangeLog	2021-01-03 23:22:25 UTC (rev 57319)
+++ trunk/Build/source/libs/freetype2/ChangeLog	2021-01-04 00:01:15 UTC (rev 57320)
@@ -1,3 +1,10 @@
+2021-01-03  Karl Berry  <karl at 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 at w32tex.org>
 
 	Import freetype-2.10.4.

Modified: trunk/Build/source/libs/freetype2/Makefile.am
===================================================================
--- trunk/Build/source/libs/freetype2/Makefile.am	2021-01-03 23:22:25 UTC (rev 57319)
+++ trunk/Build/source/libs/freetype2/Makefile.am	2021-01-04 00:01:15 UTC (rev 57320)
@@ -25,7 +25,9 @@
 # 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 @@
 	  $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \
 	    $(config_args) --disable-shared \
 	    --without-bzip2 \
+	    --without-brotli \
+	    --without-harfbuzz \
+	    --without-png \
 	    --without-zlib \
-	    --without-png \
-	    --without-harfbuzz \
 	    --prefix=$(abs_builddir)/ft-install \
 	    --libdir=$(abs_builddir) \
 	    --includedir=$(abs_builddir)

Modified: trunk/Build/source/libs/freetype2/Makefile.in
===================================================================
--- trunk/Build/source/libs/freetype2/Makefile.in	2021-01-03 23:22:25 UTC (rev 57319)
+++ trunk/Build/source/libs/freetype2/Makefile.in	2021-01-04 00:01:15 UTC (rev 57320)
@@ -599,7 +599,9 @@
 # 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 @@
 	  $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \
 	    $(config_args) --disable-shared \
 	    --without-bzip2 \
+	    --without-brotli \
+	    --without-harfbuzz \
+	    --without-png \
 	    --without-zlib \
-	    --without-png \
-	    --without-harfbuzz \
 	    --prefix=$(abs_builddir)/ft-install \
 	    --libdir=$(abs_builddir) \
 	    --includedir=$(abs_builddir)

Modified: trunk/Build/source/libs/freetype2/configure
===================================================================
--- trunk/Build/source/libs/freetype2/configure	2021-01-03 23:22:25 UTC (rev 57319)
+++ trunk/Build/source/libs/freetype2/configure	2021-01-04 00:01:15 UTC (rev 57320)
@@ -4355,7 +4355,8 @@
 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 @@
 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

Modified: trunk/Build/source/libs/freetype2/configure.ac
===================================================================
--- trunk/Build/source/libs/freetype2/configure.ac	2021-01-03 23:22:25 UTC (rev 57319)
+++ trunk/Build/source/libs/freetype2/configure.ac	2021-01-04 00:01:15 UTC (rev 57320)
@@ -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 at tug.org>
+dnl   Copyright 2018-2020 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2009-2013 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -20,7 +21,8 @@
 
 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 @@
 fi
 
 AC_SUBST([config_args])
-
 AC_SUBST([FREETYPE_TREE], [freetype-src])
 
 AC_CONFIG_FILES([Makefile])
-
 AC_OUTPUT


Property changes on: trunk/Build/source/libs/freetype2/configure.ac
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property