List:Internals« Previous MessageNext Message »
From:sasha Date:February 23 2002 9:42pm
Subject:bk commit into 3.23 tree
View as plain text  
Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-02-23 14:42:32-07:00, sasha@stripped
  updated glibc build instructions

  Docs/glibc-2.2.5.patch
    1.1 02/02/23 14:42:31 sasha@stripped +73 -0

  Docs/glibc-2.2.5.patch
    1.0 02/02/23 14:42:31 sasha@stripped +0 -0
    BitKeeper file /reiser-data/mysql/Docs/glibc-2.2.5.patch

  Docs/linuxthreads.txt
    1.2 02/02/23 14:42:31 sasha@stripped +6 -4
    u

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql
--- New file ---
+++ Docs/glibc-2.2.5.patch	02/02/23 14:42:31
diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/internals.h ./linuxthreads/internals.h
--- ../glibc-2.2.5/linuxthreads/internals.h	Thu Nov 29 00:44:16 2001
+++ ./linuxthreads/internals.h	Fri Feb 22 21:18:09 2002
@@ -343,7 +343,7 @@
    THREAD_SELF implementation is used, this must be a power of two and
    a multiple of PAGE_SIZE.  */
 #ifndef STACK_SIZE
-#define STACK_SIZE  (2 * 1024 * 1024)
+#define STACK_SIZE  (128 * 1024)
 #endif
 
 /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
--- ../glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Thu Jun  8 13:49:49 2000
+++ ./linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Fri Feb 22 21:18:09 2002
@@ -64,7 +64,7 @@
 /* The number of threads per process.  */
 #define _POSIX_THREAD_THREADS_MAX	64
 /* This is the value this implementation supports.  */
-#define PTHREAD_THREADS_MAX	1024
+#define PTHREAD_THREADS_MAX	4096
 
 /* Maximum amount by which a process can descrease its asynchronous I/O
    priority level.  */
diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/nss/nsswitch.c ./nss/nsswitch.c
--- ../glibc-2.2.5/nss/nsswitch.c	Tue Jul 17 02:21:36 2001
+++ ./nss/nsswitch.c	Fri Feb 22 21:18:09 2002
@@ -515,8 +515,16 @@
 					     + (line - name + 1));
       if (new_service == NULL)
 	return result;
-
+#ifdef DO_STATIC_NSS
+      if (strncmp(name,"files",5) == 0 ||
+	  strncmp(name,"dns",3) == 0)
+#endif      
       *((char *) __mempcpy (new_service->name, name, line - name)) = '\0';
+#ifdef DO_STATIC_NSS
+      else
+        *((char *) __mempcpy (new_service->name, "files", 5)) = '\0';
+#endif      
+	
 
       /* Set default actions.  */
       new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/time/Makefile ./time/Makefile
--- ../glibc-2.2.5/time/Makefile	Fri Feb 22 21:27:19 2002
+++ ./time/Makefile	Fri Feb 22 21:26:47 2002
@@ -37,8 +37,8 @@
 
 include ../Rules
 
-tz-cflags = -DTZDIR='"$(zonedir)"' \
-	    -DTZDEFAULT='"$(localtime-file)"' \
+tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
+	    -DTZDEFAULT='"/etc/localtime"' \
 	    -DTZDEFRULES='"$(posixrules-file)"'
 
 CFLAGS-tzfile.c = $(tz-cflags)
diff -Nur --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet ../glibc-2.2.5/timezone/Makefile ./timezone/Makefile
--- ../glibc-2.2.5/timezone/Makefile	Wed Aug 29 16:45:25 2001
+++ ./timezone/Makefile	Fri Feb 22 21:18:09 2002
@@ -159,8 +159,8 @@
 
 $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
 
-tz-cflags = -DTZDIR='"$(zonedir)"' \
-	    -DTZDEFAULT='"$(localtime-file)"' \
+tz-cflags = -DTZDIR='"/usr/share/zoneinfo/"' \
+	    -DTZDEFAULT='"/etc/localtime"' \
 	    -DTZDEFRULES='"$(posixrules-file)"' \
 	    -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
 


--- 1.1/Docs/linuxthreads.txt	Fri Feb 15 14:02:48 2002
+++ 1.2/Docs/linuxthreads.txt	Sat Feb 23 14:42:31 2002
@@ -5,11 +5,13 @@
  - wget ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz
  - tar zxvf glibc-2.2.5.tar.gz ; cd glibc-2.2.5 ;
    tar zxvf ../glibc-linuxthreads-2.2.5.tar.gz
- - in linuxthreads/internals.h change STACK_SIZE to (128*1024)
- - in linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h change
-   PTHREAD_THREADS_MAX to 4096
- - ./configure --prefix=/usr/local/mysql-glibc --enable-static-nss --disable-shared --enable-add-ons=linuxthreads
+ - patch -p1 < ~/bk/mysql/Docs/glibc-2.2.5.patch
+ - ./configure --prefix=/usr/local/mysql-glibc --enable-static-nss \
+  --disable-shared --enable-add-ons=linuxthreads --target=i386 \
+  --host=i386-pc-linux-gnu
  - make
  - possible problems - if compiler is not properly installed, one can get
  "cpp: too many input" files error - easiest way to solve - SUSE RPM for gcc
  2.95
+ - surun make install
+ - To build the binaries, run Build-tools/Do-linux-build
Thread
bk commit into 3.23 treesasha23 Feb