[Glibc-bsd-commits] r1744 - trunk/web/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-11-22 15:57:44 +0100 (Wed, 22 Nov 2006)
New Revision: 1744

Modified:
   trunk/web/patches/icedove.diff
Log:
* previous icedove.diff broke many platforms, 
  this one should be better
  needs retesting at least on linux-amd64



Modified: trunk/web/patches/icedove.diff
===================================================================
--- trunk/web/patches/icedove.diff	2006-11-22 14:30:23 UTC (rev 1743)
+++ trunk/web/patches/icedove.diff	2006-11-22 14:57:44 UTC (rev 1744)
@@ -184,7 +184,7 @@
 +diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
 +--- mozilla/security/coreconf/Linux.mk	2005-02-02 00:39:18.000000000 +0100
 ++++ mozilla/security/coreconf/Linux.mk	2006-11-20 22:16:26.000000000 +0100
-+@@ -52,59 +52,35 @@
++@@ -52,59 +52,34 @@
 + 
 + DEFAULT_COMPILER = gcc
 + 
@@ -251,7 +251,7 @@
 +-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 +-	CPU_ARCH        = mips
 ++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
-+ else
++-else
 +-	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 ++	OS_REL_CFLAGS	+= -Di386
 + 	CPU_ARCH	= x86