[libreoffice] 01/01: sigh. actually add non-part parts of make cppunit build-dep optional and add <!nocheck> to the build-dep; run build-nocheck with --without-junit --without-cppunit
Rene Engelhard
rene at moszumanska.debian.org
Thu May 25 18:34:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 8523ef5360c153a3e0026e343f32d15f9faa03ed
Author: Rene Engelhard <rene at debian.org>
Date: Thu May 25 20:33:58 2017 +0200
sigh. actually add non-part parts of make cppunit build-dep optional and add <!nocheck> to the build-dep; run build-nocheck with --without-junit --without-cppunit
---
changelog | 7 +++++++
control | 2 +-
patches/series | 2 ++
rules | 40 ++++++++++++++++++++++++++++++----------
tests/control | 2 +-
5 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index 935a61f..22fb660 100644
--- a/changelog
+++ b/changelog
@@ -10,11 +10,18 @@ libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
dependency...) back to -common/-core since it has the above new feature and
otherwise it may get confusing what is what.
+ * debian/rules, debian/patches/cppunit-optional.diff: as name says;
+ make cppunit build-dep optional and add <!nocheck> to the build-dep
+ * debian/patches/disable-unneeded-test-programs.diff : micro-optimisation;
+ as name says.
+
* tarballs/pdfium-3064.tar.bz2, debian/copyright,
debian/source/include-binaries: include pdfium
* debian/rules:
- adapt for (upcoming) usage of dh_missing
+ - run build-nocheck with --without-junit --without-cppunit to configure
+ and run check without them
-- Rene Engelhard <rene at debian.org> Thu, 18 May 2017 12:54:08 +0200
diff --git a/control b/control
index 8b088b7..13270e0 100644
--- a/control
+++ b/control
@@ -57,7 +57,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
- libcppunit-dev (>= 1.14),
+ libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
diff --git a/patches/series b/patches/series
index 6996f40..6be5018 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,5 @@ system-officeotron-and-odfvalidator.diff
no-openssl.diff
disable-sc_subsequent_filters_test-with-internal-cppunit.diff
check-for-dejavu.diff
+cppunit-optional.diff
+disable-unused-test-programs.diff
diff --git a/rules b/rules
index 05e6f4b..c8eabcf 100755
--- a/rules
+++ b/rules
@@ -260,6 +260,7 @@ PACKAGE_SDK_DOCS=y
endif
PACKAGE_LOKIT=y
+ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
@@ -318,6 +319,12 @@ else
ENABLE_EXPORT_VALIDATION_TESTS=n
BUILD_TEST_PACKAGE=n
endif
+else
+ RUN_MAKE_CHECK=n
+ ENABLE_JUNIT4=n
+ ENABLE_EXPORT_VALIDATION_TESTS=n
+ BUILD_TEST_PACKAGE=n
+endif
ifeq "$(ENABLE_JUNIT4)" "y"
JUNIT_MIN_VER= (>= 4.8.2-2)
endif
@@ -869,16 +876,14 @@ endif
OPENCL_SUGGESTS := ocl-icd-libopencl1
-ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
- ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
- else
- ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+else
+ ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
- endif
endif
- PYTHON_SIX_RECOMMENDS = python3-six
endif
+ PYTHON_SIX_RECOMMENDS = python3-six
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
@@ -922,15 +927,19 @@ endif
ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
endif
-ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
-endif
BUILD_DEPS += , gdb$(OOO_NO_CHECK_ARCHS) <!nocheck>
BUILD_DEPS += , fontconfig$(OOO_NO_CHECK_ARCHS) <!nocheck>
BUILD_DEPS += , fonts-liberation$(OOO_NO_CHECK_ARCHS) <!nocheck>
BUILD_DEPS += , fonts-crosextra-carlito$(OOO_NO_CHECK_ARCHS) <!nocheck>
# https://lists.freedesktop.org/archives/libreoffice/2017-May/077764.html
BUILD_DEPS += , fonts-dejavu$(OOO_NO_CHECK_ARCHS) <!nocheck>
+ ifeq "$(RUN_MAKE_CHECK)" "y"
+ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))$(OOO_NO_CHECK_ARCHS) <!nocheck>
+ endif
+ else
+ CONFIGURE_FLAGS += --without-cppunit
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)$(OOO_NO_CHECK_ARCHS) <!nocheck>
else
@@ -1942,7 +1951,7 @@ $(STAMP_DIR)/build-arch:
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
- ./autogen.sh $(CONFIGURE_FLAGS) \
+ ./autogen.sh $(CONFIGURE_FLAGS) --without-junit --without-cppunit \
--without-doxygen --without-javadoc --disable-ext-wiki-publisher \
--disable-report-builder --disable-scripting-javascript \
--disable-scripting-beanshell \
@@ -2000,6 +2009,17 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
endif
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ CLANGDIR=$(CLANGDIR) \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
+ OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
+ ./autogen.sh $(CONFIGURE_FLAGS) \
+ --without-doxygen --without-javadoc --disable-ext-wiki-publisher \
+ --disable-report-builder --disable-scripting-javascript \
+ --disable-scripting-beanshell \
+ --with-galleries=no
$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
cd $(SOURCE_TREE) && \
export PATH=$(BUILD_PATH); \
diff --git a/tests/control b/tests/control
index 700952b..ffdfe36 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list