From 72c0a53b43644983b67f1149ea1ca33df74495d1 Mon Sep 17 00:00:00 2001 From: Mojca Miklavec Date: Sun, 16 Apr 2017 23:06:50 +0000 Subject: fix tlpsrc definitions after changing the darwin platforms git-svn-id: svn://tug.org/texlive/trunk@43873 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 5 +++-- Master/tlpkg/tlpsrc/biber.tlpsrc | 5 ++++- Master/tlpkg/tlpsrc/luatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/mflua.tlpsrc | 2 +- Master/tlpkg/tlpsrc/xindy.tlpsrc | 8 ++++---- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index 72b6e464f56..b830cf94c91 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -33,9 +33,10 @@ binpattern f tlpkg/installer/xz/xzdec.${ARCH} # the platforms for which we provide wget: binpattern f/\ amd64-freebsd,amd64-netbsd,\ -i386-freebsd,i386-netbsd,i386-solaris,\ +i386-darwin,i386-freebsd,i386-netbsd,i386-solaris,\ +powerpc-darwin,\ sparc-solaris,\ -universal-darwin,win32,x86_64-darwin,x86_64-solaris \ +win32,x86_64-darwin,x86_64-darwinlegacy,x86_64-solaris \ tlpkg/installer/wget/wget.${ARCH} # # Must annoyingly list explicit Windows (but not Cygwin) exe's, since diff --git a/Master/tlpkg/tlpsrc/biber.tlpsrc b/Master/tlpkg/tlpsrc/biber.tlpsrc index d59fac92dd4..5658619915b 100644 --- a/Master/tlpkg/tlpsrc/biber.tlpsrc +++ b/Master/tlpkg/tlpsrc/biber.tlpsrc @@ -4,7 +4,10 @@ docpattern +!d texmf-dist/doc/latex/biblatex binpattern f/!\ amd64-netbsd,\ armhf-linux,\ +i386-darwin,\ i386-netbsd,\ +powerpc-darwin,\ powerpc-linux,\ -sparc-solaris\ +sparc-solaris,\ +x86_64-darwinlegacy\ bin/${ARCH}/biber diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc index 27890833081..65f4c765a52 100644 --- a/Master/tlpkg/tlpsrc/luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc @@ -36,7 +36,7 @@ binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexlua*.dll binpattern f bin/win32/lua*.dll tlpsetvar no_luajit_platforms \ - sparc-solaris,x86_64-solaris + powerpc-darwin,sparc-solaris,x86_64-solaris # binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajit diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc index 3ad136f6fad..c039d77be01 100644 --- a/Master/tlpkg/tlpsrc/mflua.tlpsrc +++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc @@ -16,7 +16,7 @@ binpattern f bin/${ARCH}/mflua-nowin # duplicated in luatex.tlpsrc, sigh. tlpsetvar no_jit_platforms \ - sparc-solaris,x86_64-solaris + powerpc-darwin,sparc-solaris,x86_64-solaris # binpattern f/!${no_jit_platforms} bin/${ARCH}/mfluajit binpattern f/!${no_jit_platforms} bin/${ARCH}/mfluajit-nowin diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc index 3a53fb5e1da..6e50581915e 100644 --- a/Master/tlpkg/tlpsrc/xindy.tlpsrc +++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc @@ -16,10 +16,10 @@ binpattern f/!i386-cygwin,x86_64-cygwin,win32,${no_xindy_platforms} \ bin/${ARCH}/xindy.run binpattern f/i386-cygwin,x86_64-cygwin,win32 bin/${ARCH}/xindy-lisp.exe # -# darwin has to split the mem file by architecture. -binpattern f/!universal-darwin,${no_xindy_platforms} bin/${ARCH}/xindy.mem -binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem -binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem +# darwin used to split the mem file by architecture, this needs fixing. +binpattern f/!i386-darwin,powerpc-darwin,${no_xindy_platforms} bin/${ARCH}/xindy.mem +binpattern f/i386-darwin bin/i386-darwin/xindy-i386.mem +binpattern f/powerpc-darwin bin/powerpc-darwin/xindy-ppc.mem # docpattern f texmf-dist/doc/man/man1/*xindy.* docpattern d texmf-dist/doc/xindy -- cgit v1.2.3