[libreoffice] 02/03: Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
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 eee4179394063c5d0c8698b344c1da7108c75139
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 15 00:30:49 2016 +0200
Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
---
changelog | 3 ++-
control | 2 +-
rules | 20 +++-----------------
tests/control | 2 +-
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/changelog b/changelog
index b7461d2..5f45bd6 100644
--- a/changelog
+++ b/changelog
@@ -10,7 +10,8 @@ libreoffice (1:5.2.0~alpha1~git20160411-1) UNRELEASED; urgency=medium
* debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
to -gtk2
* debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
- -dev-common
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
* debian/uno-libs3.symbols: update
-- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
diff --git a/control b/control
index f082dfa..dd99726 100644
--- a/control
+++ b/control
@@ -27,7 +27,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
fonts-crosextra-carlito,
fonts-liberation,
g++-5 [hppa ia64 s390 sparc],
- g++-mingw-w64-i686 [i386 amd64],
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
@@ -150,6 +149,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
zlib1g-dev
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
+ g++-mingw-w64-i686,
libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
libbsh-java,
libcommons-logging-java [!mips64],
diff --git a/rules b/rules
index b511625..d5d5f80 100755
--- a/rules
+++ b/rules
@@ -596,11 +596,6 @@ $(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_UNOWINREG_DLL_ARCHS := i386 amd64
-ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_UNOWINREG_DLL_ARCHS)))
- PACKAGE_UNOWINREG_DLL=n
-endif
-
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
@@ -1061,9 +1056,9 @@ export JAVA_HOME
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
ifeq "$(BUILD_UNOWINREG_DLL)" "y"
- CONFIGURE_FLAGS += --enable-build-unowinreg
- BUILD_DEPS += , g++-mingw-w64-i686 [$(OOO_UNOWINREG_DLL_ARCHS)]
- CONFIGURE_FLAGS += --with-mingw-cross-compiler=i686-w64-mingw32-g++
+ CONFIGURE_FLAGS_INDEP += --enable-build-unowinreg
+ BUILD_DEPS_INDEP += , g++-mingw-w64-i686
+ CONFIGURE_FLAGS_INDEP += --with-mingw-cross-compiler=i686-w64-mingw32-g++
endif
endif
endif
@@ -1908,14 +1903,10 @@ $(STAMP_DIR)/prepare:
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
-ifneq "$(PACKAGE_UNOWINREG_DLL)" "y"
- ifneq "$(BUILD_UNOWINREG_DLL)" "y"
# create fake file if file not there; we don't use it anyways.
if [ ! -f $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll ]; then \
touch $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll; \
fi
- endif
-endif
touch $@
@@ -3437,11 +3428,6 @@ ifneq ($(PACKAGE_SDK_DOCS),y)
echo "For uploads with binary-all packages, please use arches where the SDK docs are enabled!!!!"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
-ifneq ($(PACKAGE_UNOWINREG_DLL),y)
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "For uploads with binary-all packages, please use arches where unowinregl.dll is packaged!!!!"
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-endif
dh_testdir
dh_testroot
diff --git a/tests/control b/tests/control
index 9ca3a02..90b6f46 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, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), 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.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), 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.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: