From 36ff8423c3656890b4a7a5b187b566403376e2dd Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Tue, 18 May 2010 14:05:20 +0200
Subject: systemlibc: migrate systemlibc to hg; try again from scratch

---
 external/glibc-2.1.3.patch | 11 +++++++++--
 external/glibc/makefile.mk | 10 +++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'external')

diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 57aae6a9c0fd..8820943a0ee0 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,63 @@
+@@ -1 +1,69 @@
 -dummy
 +#*************************************************************************
 +#
@@ -123,14 +123,16 @@
 +
 +# --- Files --------------------------------------------------------
 +
++.IF "$(SYSTEM_GETOPT)" != "YES"
 +OBJFILES=	$(OBJ)$/getopt.obj		\
 +			$(OBJ)$/getopt1.obj
 +
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
 +LIB1ARCHIV=$(LB)$/lib$(TARGET).a
 +LIB1OBJFILES=$(OBJFILES)
++.ENDIF
 +
-+.IF "$(OS)"=="NETBSD"
++.IF "$(SYSTEM_READDIR_R)" != "YES"
 +TARGET2=gnu_readdir_r
 +OBJFILES+= $(OBJ)$/readdir_r.obj
 +LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -138,6 +140,11 @@
 +LIB2OBJFILES= $(OBJ)$/readdir_r.obj
 +.ENDIF
 +
++.IF "$(SYSTEM_READDIR_R)" == "YES" && "$(SYSTEM_GETOPT)" == "YES"
++@all:
++	@echo "Nothing to do here.
++.ENDIF
++
 +# --- Targets ------------------------------------------------------
 +
 +.INCLUDE :  target.mk
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index cf4516515a67..ecd064e44ebd 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -36,10 +36,14 @@ TARGET=getopt
 
 # --- Files --------------------------------------------------------
 
+.IF "$(SYSTEM_GETOPT)" != "YES" || "$(SYSTEM_READDIR_R)" != "YES"
 TARFILE_NAME=glibc-2.1.3-stub
 TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
 TARFILE_ROOTDIR=glibc-2.1.3
-ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c
+ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
+.IF "$(SYSTEM_READDIR_R)" != "YES"
+ADDITIONAL_FILES += posix$/readdir_r.c
+.ENDIF
 
 PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
 
@@ -48,6 +52,10 @@ CONFIGURE_ACTION=
 
 BUILD_DIR=posix
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+.ELSE
+@all:
+    @echo "Nothing to do here."
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
-- 
cgit 


From 458067db24e3cfc0ffa37419d8ed659e0fb53c47 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Sat, 22 May 2010 15:59:46 +0100
Subject: cmcfixes75: #i111770# remove configure.in hacks and handle prelinked
 system-stdlibs properly and fix the so.1 -> so.2 for hppa and m68k

---
 external/gcc3_specific/makefile.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'external')

diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 4ad02335c8ea..23940c30f8d1 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -47,14 +47,14 @@ $(MINGWGXXDLL) :
 
 .EXPORT : CC
 
-all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.1
+all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
 
 
 $(LB)$/libstdc++.so.$(SHORTSTDCPP3) :
-       $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
+    $(GCCINSTLIB) libstdc++.so.$(SHORTSTDCPP3) $(LB)
 
-$(LB)$/libgcc_s.so.1 :
-       $(GCCINSTLIB) libgcc_s.so.1 $(LB)
+$(LB)$/libgcc_s.so.$(SHORTSTDC3) :
+    $(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
 
 .ENDIF
 .ENDIF 
-- 
cgit 


From 2d56605a7e3b79750d0d64aee5442b5de6decfd8 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Tue, 25 May 2010 11:56:39 +0200
Subject: systemlibc: rename new SYSTEM_* variables to better names
 )SYSTEM_LIBC,HAVE_{GETOPT,READDIR_R). Unconditionally set to NO if $_os =
 WINNT

---
 external/glibc-2.1.3.patch | 6 +++---
 external/glibc/makefile.mk | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'external')

diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 8820943a0ee0..a9c7e7be3597 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -123,7 +123,7 @@
 +
 +# --- Files --------------------------------------------------------
 +
-+.IF "$(SYSTEM_GETOPT)" != "YES"
++.IF "$(HAVE_GETOPT)" != "YES"
 +OBJFILES=	$(OBJ)$/getopt.obj		\
 +			$(OBJ)$/getopt1.obj
 +
@@ -132,7 +132,7 @@
 +LIB1OBJFILES=$(OBJFILES)
 +.ENDIF
 +
-+.IF "$(SYSTEM_READDIR_R)" != "YES"
++.IF "$(HAVE_READDIR_R)" != "YES"
 +TARGET2=gnu_readdir_r
 +OBJFILES+= $(OBJ)$/readdir_r.obj
 +LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -140,7 +140,7 @@
 +LIB2OBJFILES= $(OBJ)$/readdir_r.obj
 +.ENDIF
 +
-+.IF "$(SYSTEM_READDIR_R)" == "YES" && "$(SYSTEM_GETOPT)" == "YES"
++.IF "$(HAVE_READDIR_R)" == "YES" && "$(HAVE_GETOPT)" == "YES"
 +@all:
 +	@echo "Nothing to do here.
 +.ENDIF
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index ecd064e44ebd..084752f1aaa7 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -36,12 +36,12 @@ TARGET=getopt
 
 # --- Files --------------------------------------------------------
 
-.IF "$(SYSTEM_GETOPT)" != "YES" || "$(SYSTEM_READDIR_R)" != "YES"
+.IF "$(HAVE_GETOPT)" != "YES" || "$(HAVE_READDIR_R)" != "YES"
 TARFILE_NAME=glibc-2.1.3-stub
 TARFILE_MD5=4a660ce8466c9df01f19036435425c3a
 TARFILE_ROOTDIR=glibc-2.1.3
 ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h
-.IF "$(SYSTEM_READDIR_R)" != "YES"
+.IF "$(HAVE_READDIR_R)" != "YES"
 ADDITIONAL_FILES += posix$/readdir_r.c
 .ENDIF
 
-- 
cgit 


From 94b12d448ec2b5c026072fb4a4756edca289967b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Wed, 2 Jun 2010 12:08:17 +0100
Subject: cmcfixes75: #i111770# handle libgcc_s.so.1|2|4 in deliver

---
 external/prj/d.lst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'external')

diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c6f801..20b727cad60b 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -18,8 +18,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 
 ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
 
-..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
-..\%__SRC%\lib\libstdc++.so.6 %_DEST%\lib%_EXT%\libstdc++.so.6
+..\%__SRC%\lib\libgcc_s.so.* %_DEST%\lib%_EXT%\libgcc_s.so.*
+..\%__SRC%\lib\libstdc++.so.* %_DEST%\lib%_EXT%\libstdc++.so.*
 
 ..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll
 
-- 
cgit 


From 4263775085d36363d09b1d3ec9c7d0d9951288de Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 16 Jun 2010 19:57:33 +0200
Subject: CWS systemlibc: #i69033#: some fixes for Windows

---
 external/glibc-2.1.3.patch | 4 ++--
 external/glibc/makefile.mk | 5 +++++
 external/prj/d.lst         | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'external')

diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index a9c7e7be3597..dddc22a3e009 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
  extern int getopt ();
 --- misc/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:50 2008
 +++ misc/build/glibc-2.1.3/posix/makefile.mk	Mon Mar 31 09:43:38 2008
-@@ -1 +1,69 @@
+@@ -1 +1,70 @@
 -dummy
 +#*************************************************************************
 +#
@@ -132,7 +132,7 @@
 +LIB1OBJFILES=$(OBJFILES)
 +.ENDIF
 +
-+.IF "$(HAVE_READDIR_R)" != "YES"
++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
 +TARGET2=gnu_readdir_r
 +OBJFILES+= $(OBJ)$/readdir_r.obj
 +LIB2TARGET=$(SLB)$/$(TARGET2).lib
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index 084752f1aaa7..04e2ff5b99bd 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -52,6 +52,11 @@ CONFIGURE_ACTION=
 
 BUILD_DIR=posix
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+OUT2INC= \
+    posix/getopt.h \
+    posix/config.h
+
 .ELSE
 @all:
     @echo "Nothing to do here."
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 2c50c4c6f801..5153d4ace421 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -12,6 +12,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
 ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
 ..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
 
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
+
 ..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
 ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
 ..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
-- 
cgit