diff options
| author | Rene Engelhard <rene@openoffice.org> | 2010-05-18 14:05:20 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@openoffice.org> | 2010-05-18 14:05:20 +0200 |
| commit | 36ff8423c3656890b4a7a5b187b566403376e2dd (patch) | |
| tree | 2bd3d02807db9e82668d2b5752ea554426f4e300 /external | |
| parent | bdb13254f79131f8ac2568079367c910c8fc551a (diff) | |
systemlibc: migrate systemlibc to hg; try again from scratch
Diffstat (limited to 'external')
| -rw-r--r-- | external/glibc-2.1.3.patch | 11 | ||||
| -rw-r--r-- | external/glibc/makefile.mk | 10 |
2 files changed, 18 insertions, 3 deletions
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 ------------------------------------------------------ |