From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/ppp/include/net/ppp_defs.h |  2 +-
 mdk-stage1/ppp/pppd/Makefile          | 26 ++++++++------------------
 mdk-stage1/ppp/pppd/sys-linux.c       |  2 +-
 mdk-stage1/ppp/pppd/utils.c           |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'mdk-stage1/ppp')

diff --git a/mdk-stage1/ppp/include/net/ppp_defs.h b/mdk-stage1/ppp/include/net/ppp_defs.h
index c35020eab..46bef52bb 100644
--- a/mdk-stage1/ppp/include/net/ppp_defs.h
+++ b/mdk-stage1/ppp/include/net/ppp_defs.h
@@ -97,7 +97,7 @@
  */
 
 #if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \
- && !defined(__FreeBSD__) && (NS_TARGET < 40)
+ && !defined(__FreeBSD__) && (NS_TARGET < 40) && !defined(__dietlibc__)
 #ifdef	UINT32_T
 typedef UINT32_T	u_int32_t;
 #else
diff --git a/mdk-stage1/ppp/pppd/Makefile b/mdk-stage1/ppp/pppd/Makefile
index ad2bdae90..682ad08c1 100644
--- a/mdk-stage1/ppp/pppd/Makefile
+++ b/mdk-stage1/ppp/pppd/Makefile
@@ -20,40 +20,30 @@ include $(top_dir)/Makefile.common
 
 TARGETS = pppd
 
-ifeq (DIETLIBC, $(L))
-TARGETS += pppd-DIET
-endif
-
 BINTARGET = ../pppd-bin
 
 
 all: $(TARGETS)
 
 clean:
-	rm -f *.o *.a $(BINTARGET) pppd pppd-DIET
+	rm -f *.o *.a $(BINTARGET) pppd
 
-FLAGS = -Wall -Werror -Os -fomit-frame-pointer -DDO_BSD_COMPRESS=0 -D_linux_=1 -DHAVE_MMAP -DNO_DRAND48
+FLAGS = -Wall -Werror -Os -fomit-frame-pointer -DDO_BSD_COMPRESS=0 -D_linux_=1 -DHAVE_MMAP -DNO_DRAND48 -D_BSD_SOURCE -D_GNU_SOURCE
 
 INCS = -I../include -I.
 
+ifeq (GLIBC, $(L))
+LIBS = -static -lcrypt
+endif
+
 
 OBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap.o md5.o ccp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o multilink.o tdb.o tty.o
-OBJS-DIET = $(subst .o,-DIET.o,$(OBJS))
 
 
 pppd: $(OBJS)
-	gcc -static -o $@ $^ -lcrypt
-	$(STRIPCMD) $@
-	cp -f $@ $(BINTARGET)
-
-pppd-DIET: $(OBJS-DIET)
-	gcc $(DIETLIBC_LDFLAGS_STAGE1) -o $@ $^ $(DIETLIBC_LIBC)
+	$(DIET) gcc -o $@ $^ $(LIBS)
 	$(STRIPCMD) $@
 	cp -f $@ $(BINTARGET)
 
 $(OBJS): %.o: %.c
-	gcc $(FLAGS) $(INCS) $(GLIBC_INCLUDES) -c $< -o $@
-
-$(OBJS-DIET): %-DIET.o: %.c
-	gcc $(FLAGS) $(INCS) $(DIETLIBC_INCLUDES) -c $< -o $@
-
+	$(DIET) gcc $(FLAGS) $(INCS) $(INCLUDES) -c $< -o $@
diff --git a/mdk-stage1/ppp/pppd/sys-linux.c b/mdk-stage1/ppp/pppd/sys-linux.c
index d341bb3de..3ab92dfba 100644
--- a/mdk-stage1/ppp/pppd/sys-linux.c
+++ b/mdk-stage1/ppp/pppd/sys-linux.c
@@ -51,7 +51,7 @@
 #define MAX_ADDR_LEN 7
 #endif
 
-#if __GLIBC__ >= 2
+#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__dietlibc__)
 #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/mdk-stage1/ppp/pppd/utils.c b/mdk-stage1/ppp/pppd/utils.c
index 9c987cfcd..5861d8980 100644
--- a/mdk-stage1/ppp/pppd/utils.c
+++ b/mdk-stage1/ppp/pppd/utils.c
@@ -254,7 +254,7 @@ vslprintf(buf, buflen, fmt, args)
 	    break;
 	case 'r':
 	    f = va_arg(args, char *);
-#ifndef __powerpc__
+#if !defined(__powerpc__) && !defined(__x86_64__)
 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
 #else
 	    /* On the powerpc, a va_list is an array of 1 structure */
-- 
cgit v1.2.1