From 91785746e58edc791ecf402be4627b643cbdb4e5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 5 Mar 2018 15:34:41 +0000 Subject: musl support git-svn-id: svn://tug.org/texlive/trunk@46834 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 10 ++++++++++ Master/tlpkg/bin/tl-update-bindir | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 5fa568e01be..f97acd82e05 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -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', ); diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index cf72d798fd8..899589bd31f 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -144,6 +144,10 @@ for tlplat in $tlplats; do #default_bin_loc=/tmp/lin32.tgz;; default_bin_loc=$download_loc $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;; + i386-linuxmusl) + default_bin_loc=$download_loc + remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/latest | grep browser_download_url | grep texlive-bin-i386-musl.tar.gz | cut -d : -f 2,3 | tr -d \"` + $grab $remurl;; i386-netbsd) download_loc=$tmpdir/tl.$tlplat.tar.xz default_bin_loc=$download_loc @@ -187,6 +191,10 @@ for tlplat in $tlplats; do default_bin_loc=$download_loc $grab http://www.preining.info/x86_64-linux-svn46780.tar.gz ;; + x86_64-linuxmusl) + default_bin_loc=$download_loc + remurl=`curl -s https://api.github.com/repos/TeX-Live/texlive-source/releases/latest | grep browser_download_url | grep texlive-bin-x86_64-musl.tar.gz | cut -d : -f 2,3 | tr -d \"` + $grab $remurl;; x86_64-solaris) default_bin_loc=$download_loc $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;; -- cgit v1.2.3