diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-06-16 19:57:33 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-06-16 19:57:33 +0200 |
| commit | 4263775085d36363d09b1d3ec9c7d0d9951288de (patch) | |
| tree | 2b909520433e3a258b0dc5ef89473f76458ebb92 /external | |
| parent | 2d56605a7e3b79750d0d64aee5442b5de6decfd8 (diff) | |
CWS systemlibc: #i69033#: some fixes for Windows
Diffstat (limited to 'external')
| -rw-r--r-- | external/glibc-2.1.3.patch | 4 | ||||
| -rw-r--r-- | external/glibc/makefile.mk | 5 | ||||
| -rw-r--r-- | external/prj/d.lst | 2 |
3 files changed, 9 insertions, 2 deletions
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\* |