[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/02: remove warning on non-gcj builds and complain at control if gcj-jdk isn't installed



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

rene pushed a commit to branch master
in repository libreoffice.

commit d46dcc10e07f5f91e718a59355dc77b445285391
Author: Rene Engelhard <rene@debian.org>
Date:   Sun May 1 14:16:37 2016 +0200

    remove warning on non-gcj builds and complain at control if gcj-jdk isn't installed
---
 changelog | 8 ++++++++
 rules     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/changelog b/changelog
index 6908b31..3a3444a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - print error in control without gcj-jdk installed
+    - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 24 Apr 2016 00:02:55 +0200
+
 libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
 
   * New upstream release candidate
diff --git a/rules b/rules
index 022505f..e8d8ebe 100755
--- a/rules
+++ b/rules
@@ -1039,8 +1039,10 @@ ifeq "$(ENABLE_JAVA)" "y"
   else
 	BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
   endif
+  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/)
+  endif
 	JAVA_RUNTIME_DEPENDS = default-jre
 #  ifneq (,$(GCJ_JAWT_DEPENDS))
 #	JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
@@ -1670,6 +1672,12 @@ else
 control: debian/control
 endif
 debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang  debian/rules
+ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
+	if ! dpkg -l gcj-jdk | grep -q ^ii 2>/dev/null; then \
+		echo "Can not determine GCJ_VERSION. you need  gcj-jdk installed"; \
+		exit 1; \
+	fi
+endif
 	chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
 	sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
 	    -e "s#%[A-Za-z]*=[^%]*%##g#" \

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


Reply to: