[SCM] LibreOffice packaging repository branch, master, updated. f7b9b86da4cae07090507497b9f8ff2272dbb03c
The following commit has been merged in the master branch:
commit f7b9b86da4cae07090507497b9f8ff2272dbb03c
Author: Rene Engelhard <rene@debian.org>
Date: Sun Feb 20 18:30:27 2011 +0100
make configure.in pieces in arm-optimization.diff apply
diff --git a/patches/arm-optimization.diff b/patches/arm-optimization.diff
index 6da205b..c04a964 100644
--- a/patches/arm-optimization.diff
+++ b/patches/arm-optimization.diff
@@ -1,12 +1,11 @@
--- /dev/null 2011-02-09 23:43:13.080975836 +0100
+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/arm-optimization.diff 2011-02-19 17:42:32.000000000 +0100
@@ -0,0 +1,137 @@
-+diff -r 67e476e04669 configure.in
-+--- configure.in Fri Nov 12 20:02:04 2010 +0100
-++++ configure.in Fri Feb 18 21:47:58 2011 +0100
-+@@ -828,6 +828,16 @@
-+ AC_ARG_ENABLE(dependency-tracking,
-+ [ --disable-dependency-tracking Disables generation of dependency information.
++--- configure.in-old 2011-02-20 18:17:53.000000000 +0100
+++++ configure.in 2011-02-20 18:20:55.000000000 +0100
++@@ -1256,6 +1256,16 @@
++ can get up to CPUS*max_jobs. Defaults to 1, unless
++ you configure --enable-icecream - then to 10.
+ ],,)
++AC_ARG_WITH(arm-target,
++[ --arm-target The minimal targeted arm processor
@@ -14,18 +13,17 @@
++ Cases :
++ arm-target < 6 : armv4t compatibility
++ arm-target = 6 : exact armv6 compatibility
-++ arm-target > 6 : armv7-a compatibility
+++ arm-target > 6 : armv7-a compatibility
++
++ Usage: --with-arm-target=7
++],with_arm_target=$withval,with_arm_target=4)
+
+ BUILD_TYPE="OOo"
+
-+@@ -5803,6 +5813,24 @@
-+ AC_SUBST(GSTREAMER_CFLAGS)
-+ AC_SUBST(GSTREAMER_LIBS)
++@@ -1354,6 +1364,25 @@
++ fi
+
-++dnl ===================================================================
++ dnl ===================================================================
++dnl Check the ARM target
++dnl ===================================================================
++
@@ -43,9 +41,11 @@
++ AC_MSG_RESULT([$ARM_TARGET])
++ AC_SUBST(ARM_TARGET)
++fi
-+
-+ dnl ===================================================================
-+ dnl Check whether the Cairo libraries are available.
+++
+++dnl ===================================================================
++ dnl The following is a list of supported systems.
++ dnl Sequential to keep the logic very simple
++ dnl These values may be checked and reset later.
+diff -r 67e476e04669 sal/osl/unx/interlck.c
+--- sal/osl/unx/interlck.c Fri Nov 12 20:02:04 2010 +0100
++++ sal/osl/unx/interlck.c Fri Feb 18 21:47:58 2011 +0100
--
LibreOffice packaging repository
Reply to: