[libreoffice] 03/13: Re-add sparc64 support in rules
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 60e5019dd3ba8d0eb71b585d7ce358d7d5dac1b0
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jun 15 14:00:45 2016 +0200
Re-add sparc64 support in rules
This reverts commit 8454b93f0cf393a34dfe61fca292a0379cd45614.
Conflicts:
changelog
control
rules
---
changelog | 3 ++-
rules | 7 +++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 8ea4b56..5195721 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:5.2.0~beta2-2) UNRELEASED; urgency=medium
* debian/vars.sparc64: add
+ * debian/rules: add sparc64 support again
-- Rene Engelhard <rene@debian.org> Wed, 15 Jun 2016 13:52:09 +0200
@@ -293,7 +294,7 @@ libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
- update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
openjdks and add openjdk-8-jre
- -- Rene Engelhard <rene@debian.org> Mon, 08 Feb 2016 07:44:09 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 05 Feb 2016 12:14:51 +0100
libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
diff --git a/rules b/rules
index 8fe82e3..4d07f9d 100755
--- a/rules
+++ b/rules
@@ -81,7 +81,7 @@ endif
#########
# Default package configuration
#
-OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=\
autoconf,\
@@ -584,7 +584,7 @@ endif
OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 ppc64el s390x, $(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_64BIT_ARCHS))
-OOO_BE_ARCHS = $(filter hppa m68k mips mips64 powerpc powerpcspe ppc64 s390 s390x sparc,$(OOO_ARCHS))
+OOO_BE_ARCHS = $(filter hppa m68k mips mips64 powerpc powerpcspe ppc64 s390 s390x sparc sparc64,$(OOO_ARCHS))
OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_LE_ARCHS))
@@ -1003,6 +1003,9 @@ ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(findstring kfreebsd,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-any]
endif
+ ifneq (,$(findstring sparc64,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , default-jdk (>= 2:1.8-55) [sparc64]
+ endif
ifeq ($(java_default_version),5)
JDK=gcj-jdk
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: