[libreoffice] 03/05: remove support for building -gcj "native" packages
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit e97ad471202ba55ce94aec9888ec557fad350087
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 17 14:38:31 2016 +0200
remove support for building -gcj "native" packages
---
changelog | 2 ++
control.gcj.in | 20 --------------
rules | 85 +++-------------------------------------------------------
3 files changed, 6 insertions(+), 101 deletions(-)
diff --git a/changelog b/changelog
index 5cda312..6218210 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:5.3.0~alpha0~git20160811-1) UNRELEASED; urgency=medium
versioned Provides
* debian/rules, debian/control.transitionals.in: remove jessie->stretch
transitionals again
+ * debian/rules, control.gcj.in: remove support for building -gcj "native"
+ packages
-- Rene Engelhard <rene@debian.org> Thu, 26 May 2016 20:00:57 +0200
diff --git a/control.gcj.in b/control.gcj.in
deleted file mode 100644
index 9baaace..0000000
--- a/control.gcj.in
+++ /dev/null
@@ -1,20 +0,0 @@
-Package: libreoffice-gcj
-Architecture: %OOO_GCJ_ARCHS%
-Section: java
-Depends: gcj-jre,
- libreoffice-core (= ${binary:Version}),
- libreoffice-java-common (= ${source:Version}),
- ${java-gcj-depends},
- ${java:Depends},
- ${misc:Depends},
- ${shlibs:Depends}
-Enhances: libreoffice-base, libreoffice-writer
-Description: office productivity suite -- Java libraries for GIJ
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the .jars from libreoffice-java-common compiled to
- native to make the Java features of LibreOffice faster when using gij.
- .
- This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-
diff --git a/rules b/rules
index 4f71b03..cb65ab0 100755
--- a/rules
+++ b/rules
@@ -609,9 +609,6 @@ endif
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
-OOO_GCJ_ARCHS = $(filter-out $(OOO_OPENJDK_ARCHS), $(OOO_JAVA_ARCHS))
-$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
-
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
@@ -687,9 +684,6 @@ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
endif
endif
endif
-ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=n
-endif
ifeq "$(BUILD_TEST_PACKAGE)" "n"
DEBHELPER_OPTIONS += -Nlibreoffice-subsequentcheckbase
@@ -900,13 +894,6 @@ else
BUILD_DEPS += , dpkg-dev (>= 1.17.14)
endif
-ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
- JAVA_GCJ_DEPENDS = libgcj-common (>= 1:4.1.1-14)
- endif
-endif
-
ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
endif
@@ -1019,7 +1006,6 @@ ifeq "$(ENABLE_JAVA)" "y"
TEST_JAVA_HOME=$(JAVA_HOME)
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_JDK_ARCHS)]
- BUILD_DEPS += , gcj-native-helper [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1) [$(OOO_GCJ_ARCHS)]
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
BUILD_DEPS += , ant (>= 1.7.0)$(OOO_NO_JAVA_ARCHS), ant-optional (>= 1.7.0)$(OOO_NO_JAVA_ARCHS)
@@ -1089,7 +1075,7 @@ export JAVA_HOME
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
+ DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
endif
ifneq (,$(filter nss, $(SYSTEM_STUFF)))
@@ -1388,7 +1374,6 @@ ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS), libarchive-zip-perl$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb1.8.0-java $(HSQLDB_MINVER)
- JAVA_GCJ_DEPENDS += , libhsqldb1.8.0-java-gcj [$(OOO_GCJ_ARCHS)]
CONFIGURE_FLAGS += --with-hsqldb-jar=$(HSQLDB_JAR)
else
ifeq "$(JDK)" "gcj-jdk"
@@ -1756,13 +1741,6 @@ ifneq "$(ENABLE_HELP)" "n"
debian/control
endif
cat debian/control.ure.in >> debian/control
-ifeq "$(ENABLE_JAVA)" "y"
- ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- cat debian/control.gcj.in >> debian/control
- endif
- endif
-endif
cat debian/control.ogltrans.in >> debian/control
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
@@ -1820,7 +1798,6 @@ endif
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
@@ -2515,47 +2492,9 @@ endif
touch $@
-native-jars: $(STAMP_NATIVE_JARS)
-$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install-common
-ifeq "$(BUILD_JARS_NATIVE)" "y"
- rm -rf debian/tmp/native-jars
- mkdir -p debian/tmp/native-jars/gcj
- cp -a \
- $(PKGDIR)-common/$(OODIR)/program/classes/*.jar \
- debian/tmp/native-jars/
- cp -a \
- $(PKGDIR)-core/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes/*.jar \
- debian/tmp/native-jars/
-ifeq "$(PACKAGE_BASE)" "y"
- cp -a \
- $(PKGDIR)-base/$(OODIR)/program/classes/*.jar \
- debian/tmp/native-jars/
-endif
- : # remove problematic ones
- rm -f debian/tmp/native-jars/ridl.jar
- : # compile the others
- # the Debian i386 buildd, although having much ram still OOMs without
- # this (at unoil.jar).
- # Also the native jar build is MUCH faster with this. But it
- # won't be accepted into the official libgcj-common package so this
- # hack here is needed.
- cp /usr/lib/gcc/aotcompile.py debian/scripts
- cd debian/scripts && \
- patch -p0 < $(CURDIR)/debian/patches/aotcompile-256M-default.diff
- PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e s,debian/python-uno,,)" \
- AOT_MAKEFLAGS=-j$(NUM_CPUS) aot-compile -L /usr/lib/gcj/$(OODIRNAME) \
- debian/tmp/native-jars debian/tmp/native-jars/gcj
- gcj-dbtool -n debian/tmp/native-jars/tmp.db 64
- find debian/tmp/native-jars/gcj -name '*.db' -print0 \
- | xargs -r -0 \
- gcj-dbtool -m debian/tmp/native-jars/tmp.db debian/tmp/native-jars/tmp.db || exit 1
- rm -f debian/tmp/native-jars/gcj/*.db
-endif
- touch $@
-
# Install files generated by setup into arch-dependent package directories
install-arch: $(STAMP_DIR)/install-arch
-$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install-common $(STAMP_NATIVE_JARS)
+$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install-common
dh_testdir
dh_testroot
umask 022
@@ -2743,17 +2682,6 @@ endif
rm -f $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
-ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- rm -rf $(PKGDIR)-gcj/usr/lib/gcj
- mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
- cp -p debian/tmp/native-jars/gcj/* $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
- mkdir -p $(PKGDIR)-gcj/usr/share/gcj/classmap.d
- cp -p debian/tmp/native-jars/tmp.db \
- $(PKGDIR)-gcj/usr/share/gcj/classmap.d/libreoffice.db
- endif
-endif
-
# remove empty resource directories
for i in draw base writer impress calc math; do \
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
@@ -3211,11 +3139,6 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
done
dh_installchangelogs -a -k
dh_installmime -a
-ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- dh_nativejava -plibreoffice-gcj -o
- endif
-endif
dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps
dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps $(OODIR)/program
dh_lintian -a
@@ -3357,7 +3280,7 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_DEP_PACKAGES); do \
if [ "$$p" = "libreoffice-presentation-console" ]; then continue; fi; \
- jh_depends -p$$p -Xlibreoffice-gcj -Xure; \
+ jh_depends -p$$p -Xure; \
done
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/base-files,//" \
@@ -3516,7 +3439,7 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_INDEP_PACKAGES); do \
if echo "$$p" | grep -q help; then continue; fi; \
- jh_depends -p$$p -Xlibreoffice-gcj \
+ jh_depends -p$$p \
-Xlibreoffice-report-builder; \
done
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: