From 4d5e70e3f9f7bbd05933b10d25ad7ef35b4f1415 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Oct 2020 23:53:58 +0000 Subject: tl-update-auto git-svn-id: svn://tug.org/texlive/trunk@56681 c570f23f-e606-0410-a88d-b1316a301751 --- .../freetype2/freetype-src/builds/unix/config.sub | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/builds/unix/config.sub') diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub index 0753e308458..8167d0871ea 100755 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2020-08-17' +timestamp='2020-10-13' # 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 @@ -1288,6 +1288,10 @@ case $basic_os in kernel=linux os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` ;; + os2-emx) + kernel=os2 + os=`echo $basic_os | sed -e 's|os2-emx|emx|'` + ;; nto-qnx*) kernel=nto os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` @@ -1367,13 +1371,7 @@ case $os in os=psos ;; qnx*) - case $cpu in - x86 | i*86) - ;; - *) - os=nto-$os - ;; - esac + os=qnx ;; hiux*) os=hiuxwe2 @@ -1722,7 +1720,7 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* ) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1741,6 +1739,8 @@ esac case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) ;; + uclinux-uclibc* ) + ;; -dietlibc* | -newlib* | -musl* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. @@ -1751,6 +1751,8 @@ case $kernel-$os in ;; nto-qnx*) ;; + os2-emx) + ;; *-eabi* | *-gnueabi*) ;; -*) -- cgit v1.2.3