summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2015-03-29 23:32:43 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2015-04-07 16:37:06 +0200
commitbecafd062ed1f14562e7441a259d34283481f2e3 (patch)
treec42aa7167f1cf8b96c008ca921cecbcb72650164
parenta4dee96ee68c7d28b0c9e1c531d435dfd52c43ba (diff)
downloadtexlive-becafd062ed1f14562e7441a259d34283481f2e3.tar.gz
texlive-becafd062ed1f14562e7441a259d34283481f2e3.tar.xz
texlive-core: Fix paths for multiarch
-rw-r--r--packages/app-text/texlive-core/texlive-core-2014-r2.exheres-018
1 files changed, 13 insertions, 5 deletions
diff --git a/packages/app-text/texlive-core/texlive-core-2014-r2.exheres-0 b/packages/app-text/texlive-core/texlive-core-2014-r2.exheres-0
index 4382890..df87f71 100644
--- a/packages/app-text/texlive-core/texlive-core-2014-r2.exheres-0
+++ b/packages/app-text/texlive-core/texlive-core-2014-r2.exheres-0
@@ -122,6 +122,8 @@ WORK="${WORKBASE}/${TL_PN}-${TL_PV}-build/"
#DEFAULT_SRC_PREPARE_PATCHES=( -p0 "${FILES}/texmfcnflua2013.patch" )
ECONF_SOURCE="${WORKBASE}/${TL_PN}-${TL_PV}-source/"
+DEFAULT_SRC_COMPILE_PARAMS=( AR=${AR} )
+
pkg_pretend() {
texlive_leftover_warning "${ROOT}"etc/texmf/web2c/updmap.cfg.d/updmap-hdr.cfg
}
@@ -139,6 +141,12 @@ src_prepare() {
texlive-common_reloc_target
edo cd "${ECONF_SOURCE}"
+
+ # Find the prefixed strings command
+ edo sed -e "s/if strings/if $(exhost --tool-prefix)strings/" \
+ -i libs/cairo/m4/float.m4
+ edo autoreconf libs/cairo
+
default
#FIXME GENTOO PATCH
@@ -169,8 +177,8 @@ src_configure() {
# We don’t currently have freetype:1, this is only used by texk/ttf2pk, which we disable
--with-system-{cairo,freetype2,gd,icu,kpathsea,libgs,pixman,libpng,ptexenc,poppler,t1lib,teckit,xpdf,zlib,zziplib}
--without-system-{graphite2,harfbuzz}
- --with-freetype2-include=/usr/include
- --with-petexenc-include=/usr/include
+ --with-freetype2-include=/usr/$(exhost --target)/include
+ --with-petexenc-include=/usr/$(exhost --target)/include
--without-freetype
@@ -226,11 +234,11 @@ src_configure() {
src_install() {
default
- dosym bibtex8 /usr/bin/bibtex
+ dosym bibtex8 /usr/$(exhost --target)/bin/bibtex
# FIXME: Comb through /usr/texmf*/scripts for cruft that shouldn't be installed
# Get rid of tlmgr bits
- edo rm -rf "${IMAGE}"/usr/{bin/tlmgr,texmf/scripts/texlive/}
+ edo rm -rf "${IMAGE}"/usr/{$(exhost --target)/bin/tlmgr,texmf/scripts/texlive/}
edo cp -pPR "${WORKBASE}/"texmf-dist "${IMAGE}"/usr/share/
dodir /usr/share/tlpkg
@@ -251,7 +259,7 @@ src_install() {
edo rm "${IMAGE}"/usr/share/texmf-dist/tex/generic/config/language.def
# handled by dev-tex/glossaries
- nonfatal edo rm "${IMAGE}/usr/bin/makeglossaries"
+ nonfatal edo rm "${IMAGE}/usr/$(exhost --target)/bin/makeglossaries"
# handled by dev-texlive/langgreek
nonfatal edo rm -r "${IMAGE}"/usr/share/texmf-dist/scripts/mkgrkindex
# handled by dev-texlive/langcyrillic