From 673d62ada7c0d1e9fe24ce1360039300ff86000e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 8 Feb 2019 14:31:14 +0300 Subject: [PATCH] texlive: fix search path on x86_64 --- app-text/texlive/texlive-2014.recipe | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app-text/texlive/texlive-2014.recipe b/app-text/texlive/texlive-2014.recipe index 23fe209f2..b0d4399c6 100644 --- a/app-text/texlive/texlive-2014.recipe +++ b/app-text/texlive/texlive-2014.recipe @@ -481,10 +481,20 @@ fetchTexLiveInstaller() if [ ! -e texmf-dist ] ; then ln -s $sourceDir2/texmf-dist/ texmf-dist fi - # Link our binaries to bin/i386-haiku - if [ ! -e bin/i386-haiku ] ; then - mkdir -p bin - ln -s $prefix/bin bin/i386-haiku + + # Link our binaries to bin/{i386,x86_64}-haiku + + if [ $targetArchitecture = x86_gcc2 ] || [ $targetArchitecture = x86 ]; then + if [ ! -e bin/i386-haiku ] ; then + mkdir -p bin + ln -s $prefix/bin bin/i386-haiku + fi + + elif [ $targetArchitecture = x86_64 ]; then + if [ ! -e bin/x86_64-haiku ] ; then + mkdir -p bin + ln -s $prefix/bin bin/x86_64-haiku + fi fi } @@ -667,7 +677,7 @@ INSTALL() # the texfm local tree should probably be done with a post-install script, perhaps sed -i -e 's/make_local_skeleton \".*//' install-tl # run the TeX Live installer, and specify all our paths, once more, to be sure... ;-) - export PATH=bin/i386-haiku:$prefix/bin:$PATH + export PATH=bin/i386-haiku:bin/x86_64-haiku:$prefix/bin:$PATH install-tl <<< $"D 1 $dataDir/texlive