[libreoffice] 02/02: only try to set GCJ_JAWT_DIR if GCJ_JAWT_DEPENDS is set
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 056bd8fecc9cd9bbc579cd1fccb3dec59287bebf
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Sat May 14 09:33:04 2016 +0200
only try to set GCJ_JAWT_DIR if GCJ_JAWT_DEPENDS is set
---
changelog | 2 ++
rules | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index fb0edd0..d5c85bb 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,8 @@ libreoffice (1:5.1.3-1) unstable; urgency=medium
from master
* debian/rules:
- bump libmdds-dev and liborcus-dev build-deps and update orcus handling
+ - fix another warning for !gcj builds: only try to set GCJ_JAWT_DIR if
+ GCJ_JAWT_DEPENDS is set
-- Rene Engelhard <rene@debian.org> Sat, 14 May 2016 00:18:49 +0200
diff --git a/rules b/rules
index 55d21dd..9cfb5d1 100755
--- a/rules
+++ b/rules
@@ -1046,6 +1046,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifneq "$(GCJ_VERSION)" ""
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
+ GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
endif
JAVA_RUNTIME_DEPENDS = default-jre
# ifneq (,$(GCJ_JAWT_DEPENDS))
@@ -1066,7 +1067,6 @@ ifeq "$(ENABLE_JAVA)" "y"
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
MEDIAWIKI_JAVA_RUNTIME_DEPENDS = $(shell echo $(JAVA_RUNTIME_DEPENDS) | sed -e "s/gcj-jre |//" | sed -e "s/sun-java5-jre//" | sed -e "s/java5-runtime/java6-runtime/")
- GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , libreoffice-java-common
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: