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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-6-g6924c88



The following commit has been merged in the debian-experimental-3.6 branch:
commit 6924c888b145a63870bd21e5f979d88e3ad16c5f
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Sep 28 17:28:50 2012 +0200

    try again with gcc 4.6 for mips* since apparently testtools/smoketest now work..

diff --git a/changelog b/changelog
index 9c23770..985c135 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.6.2~rc2-2) UNRELEASED; urgency=low
   [ Rene Engelhard ]
   * debian/patches/gcc-4.4.diff: try to work around HelpCompiler build
     failure with system-clucene with gcc 4.4... 
+  * try again with gcc 4.6 for mips* since apparently testtools/smoketest
+    now work..
 
   [ Bjoern Michaelsen ]
   * make metapackage explicit in short description 
diff --git a/rules b/rules
index c68f767..ed7a676 100755
--- a/rules
+++ b/rules
@@ -349,13 +349,6 @@ ifeq "$(DEB_HOST_ARCH)" "i386"
 	LINK_TO_STLPORT=y
 endif
 
-ifneq (,$(findstring mips,$(OOO_ARCHS)))
-	BUILD_DEPS += , gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel]
-  ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
-	GCC_VERSION := 4.4
-  endif
-endif
-
 ifeq "$(ENABLE_OPENGL)" "y"
   # doesn't make that much sense on armel and mips(el), does it? :)
   OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))

-- 
LibreOffice packaging repository


Reply to: