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