ooo-build r12253 - in trunk: . patches/dev300 patches/src680
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12253 - in trunk: . patches/dev300 patches/src680
- Date: Mon, 21 Apr 2008 16:17:42 +0100 (BST)
Author: rengelhard
Date: Mon Apr 21 15:17:41 2008
New Revision: 12253
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12253&view=rev
Log:
2008-04-21 Rene Engelhard <rene debian org>
* patches/src680/apply,
patches/dev300/sdk-settings-honour-linux.diff: honour also linux
as in s390-ibm-linux instead of only linux-gnu
Added:
trunk/patches/src680/sdk-settings-honour-linux.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Apr 21 15:17:41 2008
@@ -1110,6 +1110,10 @@
# fix build with gcc-4.3 on ix86
gcc-4.3-bridges.diff, i#86551, pmladek
+[ SdkFixes ]
+# honour also linux as in s390-ibm-linux instead of only linux-gnu,
+# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476821
+sdk-settings-honour-linux.diff
[ BFBuildBits ]
SectionOwner => pmladek
Added: trunk/patches/src680/sdk-settings-honour-linux.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sdk-settings-honour-linux.diff Mon Apr 21 15:17:41 2008
@@ -0,0 +1,16 @@
+Index: settings.mk
+===================================================================
+RCS file: /cvs/api/odk/settings/settings.mk,v
+retrieving revision 1.26.4.2
+diff -u -u -r1.26.4.2 settings.mk
+--- odk/settings/settings.mk 18 Jan 2008 19:24:00 -0000 1.26.4.2
++++ odk/settings/settings.mk 21 Apr 2008 14:14:03 -0000
+@@ -219,7 +219,7 @@
+ # Linux specific settings
+ #
+ ###########################################################################
+-ifeq "$(PLATFORM)" "linux-gnu"
++ifneq (,$(findstring linux,$(PLATFORM)))
+ # Settings for Linux using gcc compiler
+
+ PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]