texlive[49476] Build/source/libs/freetype2: always pass --build

[commits+karl at tug.org]

Revision: 49476
          http://tug.org/svn/texlive?view=revision&revision=49476
Author:   karl
Date:     2018-12-22 15:44:13 +0100 (Sat, 22 Dec 2018)
Log Message:
-----------
always pass --build argument to freetype configure, if specified

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

Modified: trunk/Build/source/libs/freetype2/ChangeLog
===================================================================
--- trunk/Build/source/libs/freetype2/ChangeLog	2018-12-22 01:23:08 UTC (rev 49475)
+++ trunk/Build/source/libs/freetype2/ChangeLog	2018-12-22 14:44:13 UTC (rev 49476)
@@ -1,3 +1,10 @@
+2018-12-22  Karl Berry  <karl at freefriends.org>
+
+	* configure.ac: always pass --build arg if specified, not just if
+	--host was also given. (The other ft configure arguments are
+	hardwired in Makefile.am.) Original report from Nelson Beebe:
+	https://tug.org/pipermail/tlbuild/2016q2/003548.html
+
 2018-05-04  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import freetype-2.9.1.

Modified: trunk/Build/source/libs/freetype2/configure
===================================================================
--- trunk/Build/source/libs/freetype2/configure	2018-12-22 01:23:08 UTC (rev 49475)
+++ trunk/Build/source/libs/freetype2/configure	2018-12-22 14:44:13 UTC (rev 49476)
@@ -4359,16 +4359,18 @@
 fi
 
 
+# pass explicit --host and --build, but nothing else?
 if test "x$host" = x; then
   config_args=
 else
   config_args="--host=$host"
-  if test "x$build" != x; then
-    config_args="$config_args --build=$build"
-  fi
 fi
+if test "x$build" != x; then
+  config_args="$config_args --build=$build"
+fi
 
 
+
 FREETYPE_TREE=freetype-src
 
 

Modified: trunk/Build/source/libs/freetype2/configure.ac
===================================================================
--- trunk/Build/source/libs/freetype2/configure.ac	2018-12-22 01:23:08 UTC (rev 49475)
+++ trunk/Build/source/libs/freetype2/configure.ac	2018-12-22 14:44:13 UTC (rev 49476)
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live at tug.org>
+dnl   Copyright 2018 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
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -19,14 +20,16 @@
 
 AM_CONDITIONAL([build], [test "x$enable_build" != xno])
 
+# pass explicit --host and --build, but nothing else?
 if test "x$host" = x; then
   config_args=
 else
   config_args="--host=$host"
-  if test "x$build" != x; then
-    config_args="$config_args --build=$build"
-  fi
 fi
+if test "x$build" != x; then
+  config_args="$config_args --build=$build"
+fi
+
 AC_SUBST([config_args])
 
 AC_SUBST([FREETYPE_TREE], [freetype-src])