------------------------------------------------------------
revno: 1760
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Tue 2010-01-12 01:07:13 +0100
message:
work around weird crash in the build by build-conflicting against
libstlport4.6-dev when building with internal STLport
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-01-11 19:52:24 +0000
+++ b/changelog 2010-01-12 00:07:13 +0000
@@ -13,10 +13,12 @@
* debian/rules:
- use internal STLport and use system-graphite also on i386 (4.6 won't
work)
+ - work around weird crash in the build by build-conflicting against
+ libstlport4.6-dev when building with internal STLport
* merge 1:3.1.1-12 and -13
- -- Rene Engelhard <[email protected]> Mon, 11 Jan 2010 13:46:44 +0100
+ -- Rene Engelhard <[email protected]> Tue, 12 Jan 2010 01:05:10 +0100
openoffice.org (1:3.1.1-13) UNRELEASED; urgency=medium
=== modified file 'rules'
--- a/rules 2010-01-11 19:52:24 +0000
+++ b/rules 2010-01-12 00:07:13 +0000
@@ -1589,6 +1589,11 @@
perl -pi -e "s/(Build-Conflicts: .*)/\1, base-files (= 5)/"
debian/control
endif
+ifneq "$(USE_SYSTEM_STLPORT)" "y"
+ # at least here it crashes the build in some funny way.
+ perl -pi -e "s/(Build-Conflicts: .*)/\1, llibstlport4.6-dev/"
debian/control
+endif
+
ifeq (4.4,$(shell LANG="C" gcc --version | head -n 1 | awk '{ print $$4 }'))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
