[libreoffice] 09/11: don't use DEB_HOST_MULTIARCH in SYSTEM_GCJ_VERSION, as it's not what we want on some archs (e.g. i386), use gcc -vs Target:

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit a306162a9019790440a8fde37e750d17d6c9d348
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 22:19:36 2016 +0100

    don't use DEB_HOST_MULTIARCH in SYSTEM_GCJ_VERSION, as it's not what we want on some archs (e.g. i386), use gcc -vs Target:
---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index db61be8..42d2c22 100755
--- a/rules
+++ b/rules
@@ -38,7 +38,7 @@ export gb_SHELL:=$(SHELL)
 #SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
 #FIXME
 SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\../\1/p' | cut -d" " -f1)
-SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-// | sed -e s/$(DEB_HOST_MULTIARCH)-//)
+SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-// | sed -e s/$(shell gcc -v 2>&1 | grep Target | awk '{ print $$2 }')-//)
 
 PKGDIR:=debian/libreoffice
 OODIRNAME=libreoffice

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git