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

[SCM] LibreOffice packaging repository branch, master, updated. cd114c82c3e7e4ea19a383ce8e8ecf31e6abbaa0



The following commit has been merged in the master branch:
commit 9d59d4094734ab5cd5716a04ae03093ddcc1ab05
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Feb 19 17:54:22 2011 +0100

    add explicit --with-arm-target=4 for armel

diff --git a/changelog b/changelog
index e85054d..71d2561 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,8 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
     optimization for armv4t/6/7, based on i117017
 
   * debian/rules:
-    - --with-arm-target=7 on armhf
+    - --with-arm-target=7 on armhf, explicit --with-arm-target=4
+      (armv4t) for armel
 
  -- Rene Engelhard <rene@debian.org>  Sat, 19 Feb 2011 17:48:57 +0100
 
diff --git a/rules b/rules
index 548c648..baeb44b 100755
--- a/rules
+++ b/rules
@@ -353,6 +353,9 @@ ifeq "$(ARCH)" "i386"
 endif
 
 # ARM target
+ifeq "$(ARCH)" "armel"
+	CONFIGURE_FLAGS += --with-arm-target=4
+endif
 ifeq "$(ARCH)" "armhf"
 	CONFIGURE_FLAGS += --with-arm-target=7
 endif

-- 
LibreOffice packaging repository


Reply to: