[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#701310: libreoffice: ftbfs with GCC-4.8



tag 701310 + pending
thanks

On Sat, Feb 23, 2013 at 05:05:58PM +0100, Rene Engelhard wrote:
> block 701310 by 695826
> thanks
[...]
> ... except that building some tests fail (because g++ 4.8 pulls in libc6
> from experimental and thus stuff using boost_thread can't be built,
> see #695826):
[...]

Steve says in #695826 that it's fixed in boost 1.53 (for which the transition
already is planned), so I'll just do this:

diff --git a/changelog b/changelog
index db6275b..d01f1a6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.2~rc2-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - build-depend on libboost-dev 1.53 when building with gcc 4.8,
+      see 701310/695826 (closes: #701310)
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Mar 2013 15:45:09 +0100
+
 libreoffice (1:4.0.2~rc2-1) experimental; urgency=low
 
   * new upstream release candidate
diff --git a/rules b/rules
index a89731e..c6e4bb3 100755
--- a/rules
+++ b/rules
@@ -948,7 +948,12 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-d
        #BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-o
     else
+      # see 701310/695826
+      ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+       BUILD_DEPS += , libboost-dev (>= 1.53), libboost-date-time-dev (>= 1.53)
+      else
        BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER)
+      endif
        #BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
     endif
   endif

Regards,
 
Rene


Reply to: