summaryrefslogtreecommitdiff
path: root/Build/source/texk/tests
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-11 20:34:15 +0000
committerKarl Berry <karl@freefriends.org>2018-03-11 20:34:15 +0000
commit896f6a972a3bb8d5d157e92626dcf02c4ed2dd3d (patch)
tree85656275b3363a31144fb492d3b163564882dac1 /Build/source/texk/tests
parent12f4c1b4d217a3b7210d66625269fd49944635d9 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@46926 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tests')
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm11
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm14
2 files changed, 19 insertions, 6 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 1873ed3b822..d8a7f366b06 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,11 +1,12 @@
+# $Id: TLConfig.pm 46841 2018-03-05 16:31:19Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2017 Norbert Preining
+# Copyright 2007-2018 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 45617 $';
+my $svnrev = '$Revision: 46841 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -51,7 +52,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2017;
+$ReleaseYear = 2018;
# users can upgrade from this year to the current year; might be the
# same as the release year, or any number of releases earlier.
@@ -107,7 +108,9 @@ our $DefaultContainerFormat = "xz";
our $DefaultContainerExtension = "tar.$DefaultContainerFormat";
# archive (not user) settings.
-# these can be overriden by putting them into 00texlive.config.tlpsrc
+# these can be overridden by putting them into 00texlive.config.tlpsrc
+# in the format
+# depend key/value
our %TLPDBConfigs = (
"container_split_src_files" => 1,
"container_split_doc_files" => 1,
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index cc1d119f778..4d89a2fa78d 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 46421 2018-01-24 03:55:35Z preining $
+# $Id: TLUtils.pm 46834 2018-03-05 15:34:41Z preining $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 46421 $';
+my $svnrev = '$Revision: 46834 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -298,6 +298,14 @@ sub platform_name {
# solaris2 is matched.
$OS = $os if $guessed_platform =~ /\b$os/;
}
+
+ if ($OS eq "linux") {
+ # deal with the special case of musl based distributions
+ # config.guess returns
+ # x86_64-pc-linux-musl
+ # i386-pc-linux-musl
+ $OS = "linuxmusl" if $guessed_platform =~ /\blinux-musl/;
+ }
if ($OS eq "darwin") {
# We have a variety of Mac binary sets.
@@ -375,6 +383,7 @@ sub platform_desc {
'i386-freebsd' => 'FreeBSD on Intel x86',
'i386-kfreebsd' => 'GNU/kFreeBSD on Intel x86',
'i386-linux' => 'GNU/Linux on Intel x86',
+ 'i386-linuxmusl' => 'GNU/Linux on Intel x86 with musl',
'i386-netbsd' => 'NetBSD on Intel x86',
'i386-openbsd' => 'OpenBSD on Intel x86',
'i386-solaris' => 'Solaris on Intel x86',
@@ -391,6 +400,7 @@ sub platform_desc {
'x86_64-darwin' => 'MacOSX current on x86_64',
'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.9) on x86_64',
'x86_64-linux' => 'GNU/Linux on x86_64',
+ 'x86_64-linuxmusl' => 'GNU/Linux on x86_64 with musl',
'x86_64-solaris' => 'Solaris on x86_64',
);