------------------------------------------------------------
revno: 1637
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2009-08-17 02:47:08 +0200
message:
when building with gcc 4.4 build with gcc-mingw32
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-08-16 23:11:42 +0000
+++ b/changelog 2009-08-17 00:47:08 +0000
@@ -7,6 +7,7 @@
- move libsdfilt* to -draw
- remove result/ and test/ from OOos own copy of libxml2, too...
(see #331534)
+ - use gcc-mingw32 instead of mingw32 when we build with gcc 4.4
* debian/rules, debian/openoffice.org-filter-binfilter-*:
Move libbf_migratefilter* back to -filter-binfilter as it's linked to
libs there. Add the regcomp (un)registering.
=== modified file 'rules'
--- a/rules 2009-08-14 10:46:56 +0000
+++ b/rules 2009-08-17 00:47:08 +0000
@@ -674,7 +674,15 @@
JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
endif
ifeq "$(DIST)" "Debian"
+ ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d.
-f1,2)" "4.4"
+ BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
+ else
+ ifeq "$(GCC_VERSION)" "4.4"
+ BUILD_DEPS += , gcc-mingw32 [$(OOO_JAVA_ARCHS)]
+ else
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
+ endif
+ endif
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
