Update texlive-bin-libre.

1 files changed, 14 insertions, 9 deletions

diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 4964b0263..6fa7ec4c7 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=texlive-bin-libre
 pkgver=2011.3
 _luatex_ver=0.70.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
 conflicts=('pdfjam' 'texlive-bin')
 replaces=('texlive-bin')
-options=('!libtool')
+options=('!libtool' '!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
 source=('texmf.cnf'
@@ -49,6 +49,11 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
          'e7f0197559ef865d8c01683dab3b8526')
 
 build() {
+   if [ "${CARCH}" != "i686" ]; then
+     export CFLAGS="${CFLAGS} -fPIC"
+     export CXXFLAGS="${CXXFLAGS} -fPIC"
+   fi
+
    cd "$srcdir"
    # Building LuaTeX
    # cd luatex-beta-${_luatex_ver}
@@ -60,7 +65,7 @@ build() {
    ../source/configure --prefix=/usr -C \
      --disable-native-texlive-build \
      --with-banner-add="/Parabola GNU/Linux-libre" \
-    --disable-cxx-runtime-hack \
+    --enable-cxx-runtime-hack \
     --disable-all-pkgs \
     --disable-dump-share \
     --disable-ptex \
@@ -215,12 +220,12 @@ package() {
    echo "--> Proceeding with make install ..."
    echo "-------------------------------------------------------"
    cd Work
-   make DESTDIR=${pkgdir} texmf="$pkgdir"/usr/share/texmf install
+   make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
    rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
 
    # replace upstream texmf.cnf with ours
    rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   install -m644 "$srcdir"/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
+   install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
    # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
    # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
    ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
@@ -230,15 +235,15 @@ package() {
    sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
 
    ## install luatex binary
-   cd "$srcdir"/luatex/build/texk/web2c
-   ./libtool --mode=install install -m755 luatex "$pkgdir"/usr/bin/
+   #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/
+   install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/
    cd "$pkgdir"/usr/bin
    /bin/ln -s luatex texlua
    /bin/ln -s luatex texluac
 
    ## install Perl libraries
-   mkdir -p $pkgdir/usr/share/tlpkg/TeXLive
-   install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm $pkgdir/usr/share/tlpkg/TeXLive
+   mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
+   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
 
    # create symlinks for formats 
    echo "--> Create symlinks for TeX formats ..."