./packages/libreoffice/3.3.0/experimental r2259: ix mingw32/gcc-mingw32 conditional to not break with gcc 4.5
------------------------------------------------------------
revno: 2259
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2010-12-27 19:24:21 +0100
message:
ix mingw32/gcc-mingw32 conditional to not break with gcc 4.5
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-27 14:44:09 +0000
+++ b/changelog 2010-12-27 18:24:21 +0000
@@ -5,13 +5,15 @@
- use dpkg -s instead of apt-cache show (closes: #607873)
- install modes.sxd into /usr/share/doc/python-uno directly, not a
extra doc/
+ - fix mingw32/gcc-mingw32 conditional to not break with gcc 4.5,
+ thanks Matthias Klose
[ Matthias Klose ]
* debian/rules:
- Remove leading whitespaces.
- Avoid some duplicate shell calls.
- -- Rene Engelhard <rene@debian.org> Mon, 27 Dec 2010 15:01:42 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Dec 2010 19:21:32 +0100
libreoffice (1:3.3.0~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-12-27 14:44:09 +0000
+++ b/rules 2010-12-27 18:24:21 +0000
@@ -964,14 +964,10 @@
endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(DIST)" "Debian"
- ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
+ ifeq "$(LENNY_BACKPORT)" "y"
+ BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+ else
BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)], mingw32-runtime [$(OOO_JAVA_ARCHS)]
- else
- ifeq "$(GCC_VERSION)" "4.4"
- BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)], mingw32-runtime [$(OOO_JAVA_ARCHS)]
- else
- BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
- endif
endif
CONFIGURE_FLAGS += --enable-build-unowinreg
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
Reply to: