[texlive-bin] 02/03: fix FTBFS on s390x due to gcc 4.9 (Closes: #753575)
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit bfe62eeb0c4c2aa951ed519d11167eb7e4edbe6c
Author: Norbert Preining <preining@debian.org>
Date: Fri Jul 4 15:25:08 2014 +0900
fix FTBFS on s390x due to gcc 4.9 (Closes: #753575)
---
debian/control | 2 +-
debian/rules | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index ce1577b..c806ebd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: tex
Priority: optional
Maintainer: Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@kuesterei.ch>
-Build-Depends: debhelper (>= 7.0.50~), sharutils, libncurses5-dev | libncurses-dev, libxaw7-dev, zlib1g-dev | libz-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite2-dev, libgs-dev, libpixman-1-dev (>= 0.32.4), libzzip-dev (>= 0.12), libharfbuzz-dev (>= 0.9.18-3), libicu-dev, recode, texinfo, automake (>= 1:1.13.1), autoconf (>= 2.69), libtool (>= 2.4.2), m4 (>= 1.4.16), libpotrace-dev (>= 1.11), libxp-dev, libxi-dev, libpaper-dev
+Build-Depends: debhelper (>= 7.0.50~), sharutils, libncurses5-dev | libncurses-dev, libxaw7-dev, zlib1g-dev | libz-dev, flex, bison, libpoppler-private-dev (>= 0.12.4), libfontconfig1-dev, dh-autoreconf, time, libgraphite2-dev, libgs-dev, libpixman-1-dev (>= 0.32.4), libzzip-dev (>= 0.12), libharfbuzz-dev (>= 0.9.18-3), libicu-dev, recode, texinfo, automake (>= 1:1.13.1), autoconf (>= 2.69), libtool (>= 2.4.2), m4 (>= 1.4.16), libpotrace-dev (>= 1.11), libxp-dev, libxi-dev, libpaper-dev, [...]
Standards-Version: 3.9.5
Homepage: http://www.tug.org/texlive/
Vcs-Git: git://anonscm.debian.org/debian-tex/texlive-bin.git
diff --git a/debian/rules b/debian/rules
index 6ea4696..96df7dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,15 @@ ifeq ($(DEB_HOST_ARCH), alpha)
export LDFLAGS = -Wl,--no-relax
endif
+#
+# gcc-4.9 creates broken binaries on s390x, see #753575
+# debian/control contains conditional build-deps on the
+# gcc/g++ 4.8 version on s390x
+ifeq ($(DEB_HOST_ARCH), s390x)
+ export CC = gcc-4.8
+ export CXX = g++-4.8
+endif
+
# for blacklisting bad archs
#ifneq (,$(filter $(DEB_HOST_ARCH), $(LUAJIT_FAIL_ARCHS)))
# DISABLE_JIT=--disable-luajittex
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: