diff options
Diffstat (limited to 'mdk-stage1/ppp')
-rw-r--r-- | mdk-stage1/ppp/include/net/ppp_defs.h | 2 | ||||
-rw-r--r-- | mdk-stage1/ppp/pppd/Makefile | 26 |
2 files changed, 9 insertions, 19 deletions
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 $@ |