[Glibc-bsd-commits] r1740 - trunk/web/patches/mozilla

[Petr Salinger]

Author: ps-guest
Date: 2006-11-21 20:37:57 +0100 (Tue, 21 Nov 2006)
New Revision: 1740

Modified:
   trunk/web/patches/mozilla/main.diff
Log:
* add part needed by mail client (thunderbird/icedove)



Modified: trunk/web/patches/mozilla/main.diff
===================================================================
--- trunk/web/patches/mozilla/main.diff	2006-11-21 19:28:59 UTC (rev 1739)
+++ trunk/web/patches/mozilla/main.diff	2006-11-21 19:37:57 UTC (rev 1740)
@@ -434,3 +434,101 @@
  
  #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
  /* Old gcc 2.7.x.x.  What does gcc 2.8.x do?? */
+Index: directory/c-sdk/configure.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v
+retrieving revision 5.53
+diff -u -r5.53 configure.in
+--- directory/c-sdk/configure.in	5 Oct 2006 23:01:43 -0000	5.53
++++ directory/c-sdk/configure.in	21 Nov 2006 08:21:20 -0000
+@@ -763,6 +763,7 @@
+     OS_TEST="${target_cpu}"
+     case "${target_os}" in
+         linux*)       OS_ARCH=Linux ;;
++        kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
+         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
+         mingw*)     OS_ARCH=WINNT ;;
+         darwin*)    OS_ARCH=Darwin ;;
+@@ -1473,7 +1474,7 @@
+ 	esac
+     ;;
+ 
+-*-linux*)
++*-linux*|*-kfreebsd*-gnu)
+     if test -z "$USE_NSPR_THREADS"; then
+         USE_PTHREADS=1
+     fi
+@@ -1483,8 +1484,12 @@
+     AC_DEFINE(_SVID_SOURCE)
+     AC_DEFINE(_LARGEFILE64_SOURCE)
+     AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
+-    AC_DEFINE(LINUX)
+-    AC_DEFINE(linux)
++    case "${target_os}" in
++     linux*)
++        AC_DEFINE(LINUX)
++        AC_DEFINE(linux)
++        ;;
++    esac
+     LD='$(CC)'
+     CFLAGS="$CFLAGS -ansi -Wall"
+     CXXFLAGS="$CXXFLAGS -ansi -Wall"
+@@ -2357,7 +2362,7 @@
+ 	        _PTHREAD_LDFLAGS=
+ 	    fi
+ 	    ;;
+-    *-linux*)
++    *-linux*|*-kfreebsd*-gnu)
+         AC_DEFINE(_REENTRANT)
+         ;;
+     esac
+@@ -2433,7 +2438,7 @@
+         fi
+     fi
+     ;;
+-*-linux*)
++*-linux*|*-kfreebsd*-gnu)
+     if test -n "$USE_NSPR_THREADS"; then
+         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
+     fi
+Index: directory/c-sdk/config/nsinstall.c
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/config/nsinstall.c,v
+retrieving revision 5.2
+diff -u -r5.2 nsinstall.c
+--- directory/c-sdk/config/nsinstall.c	10 Oct 2003 15:03:43 -0000	5.2
++++ directory/c-sdk/config/nsinstall.c	21 Nov 2006 08:21:20 -0000
+@@ -109,7 +109,7 @@
+ }
+ #endif /* NEXTSTEP */
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
+ #include <getopt.h>
+ #endif
+ 
+Index: directory/c-sdk/ldap/libraries/libldap/Makefile.client
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client,v
+retrieving revision 5.2
+diff -u -r5.2 Makefile.client
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.client	15 Oct 2003 17:26:01 -0000	5.2
++++ directory/c-sdk/ldap/libraries/libldap/Makefile.client	21 Nov 2006 08:21:20 -0000
+@@ -177,7 +177,7 @@
+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
+ endif
+ 
+-ifeq ($(OS_ARCH), Linux)
++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
+ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
+ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
+ endif
+@@ -253,7 +253,7 @@
+ ifeq ($(OS_ARCH), AIX)
+ 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+-ifeq ($(OS_ARCH), Linux)
++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
+ 	$(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ 	$(LINK_LIB) $(EXTRA_LIBS)