------------------------------------------------------------
revno: 1733
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2009-12-10 18:50:43 +0100
message:
only build-depend on (gcc-)mingw32 when we actually enable the SDK
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-09 11:45:11 +0000
+++ b/changelog 2009-12-10 17:50:43 +0000
@@ -3,17 +3,18 @@
* OpenOffice.org 3.2.0 release branch milestone 7
* ooo-build
- - update (3e299d8a16a3c45e059b74a5a4ca745ee965dd26)
+ - update (71e5da87036f34c887109476bf5f5384c1044217)
- makes "Always allow saving of document" configurable (closes: #478130)
- src: add OOO320 GSIs from ftp.linux.cz
* debian/rules:
- re-enable eo
- enable hppa, use gcj-jdk
+ - only build-depend on (gcc-)mingw32 when we actually enable the SDK
* merge 1:3.1.1-9
- -- Rene Engelhard <[email protected]> Wed, 09 Dec 2009 01:25:29 +0100
+ -- Rene Engelhard <[email protected]> Thu, 10 Dec 2009 18:50:10 +0100
openoffice.org (1:3.1.1-9) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-12-09 11:45:11 +0000
+++ b/rules 2009-12-10 17:50:43 +0000
@@ -731,17 +731,19 @@
BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
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"
+ ifeq "$(PACKAGE_SDK)" "y"
+ 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)]
+ 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
- CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
CONFIGURE_FLAGS += --enable-wiki-publisher
