[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-191-g4da21b1
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 837c6ff7000d2806e8a5b28baee82bc79bbe5b17
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Aug 29 12:38:40 2011 +0200
further tweaking for stdlibs on ppc and armel (LP: #832121)
diff --git a/changelog b/changelog
index 659caf2..ee7b9bc 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:3.4.2-2ubuntu3) UNRELEASED; urgency=low
* also patch libgcc_s magic on powerpc
+ * further tweaking for stdlibs on ppc and armel (LP: #832121)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 26 Aug 2011 18:18:52 +0200
diff --git a/patches/ubuntufixes-core.diff b/patches/ubuntufixes-core.diff
index 1cde1fb..ee1dba1 100644
--- a/patches/ubuntufixes-core.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,8 +1,8 @@
Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 12:23:09.473383123 +0200
-@@ -0,0 +1,1106 @@
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-30 10:58:19.602625234 +0200
+@@ -0,0 +1,1122 @@
+git format-patch --stdout libreoffice-3.4.2.3..distro/ubuntu/oneiric-3.4 |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+From 1821350817000893ed9643f3081fca225ca151c2 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
@@ -1072,33 +1072,37 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From f67d772edd08d22f9c5f2ab556cef33a7c8c5636 Mon Sep 17 00:00:00 2001
++From 6d237a078605ae43157206d1da99ba7f2af26784 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Thu, 25 Aug 2011 00:23:31 +0200
+Subject: [PATCH 8/8] lp#832121: libgcc_s magic breaks horribly on armel and
+ powerpc
+
+---
-+ external/gcc3_specific/makefile.mk | 6 ++++++
-+ 1 files changed, 6 insertions(+), 0 deletions(-)
++ external/gcc3_specific/makefile.mk | 9 +++++++++
++ external/prj/d.lst | 1 +
++ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
-+index 0b18d2c..7c20ef3 100644
++index 0b18d2c..1c44f6c 100644
+--- external/gcc3_specific/makefile.mk
++++ external/gcc3_specific/makefile.mk
-+@@ -6,6 +6,11 @@ TARGET=gcc3_specific
++@@ -6,6 +6,14 @@ TARGET=gcc3_specific
+ .INCLUDE: settings.mk
+ # ------------------------------------------------------------------
+
++.IF "$(CPU)" == "R" || "$(CPU)" == "P"
++all:
-++ echo "skipping libgcc_s magic on $(CPUNAME)."
+++ echo "lp#832121: circumventing prelink magic on ppc and armel"
+++ cp -p `gcc -print-file-name=libstdc++.so.$(SHORTSTDCPP3)` $(LB)
+++ cp -p `gcc -print-file-name=libgcc_s.so.$(SHORTSTDC3)` $(LB)
+++ cp -p `gcc -print-file-name=libgcc_s.so` $(LB)
++
++.ELSE
+
+ .IF "$(BUILD_SPECIAL)"==""
+
-+@@ -83,6 +88,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
++@@ -83,6 +91,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
+
+ .ENDIF
+ .ENDIF # "$(BUILD_SPECIAL)"==""
@@ -1106,6 +1110,18 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+
+
+ .INCLUDE: target.mk
++diff --git a/external/prj/d.lst b/external/prj/d.lst
++index 7809c07..0afa71f 100644
++--- external/prj/d.lst
+++++ external/prj/d.lst
++@@ -20,6 +20,7 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
++
++ ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
++
+++..\%__SRC%\lib\libgcc_s.so %_DEST%\lib%_EXT%\libgcc_s.so
++ ..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
++ ..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
++
+--
+1.7.5.4
+
--
LibreOffice packaging repository
Reply to: