SOURCES: ppp-make.patch - OPTLDFLAGS support

sparky sparky at pld-linux.org
Fri Aug 4 03:07:34 CEST 2006 

Author: sparky                       Date: Fri Aug  4 01:07:34 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- OPTLDFLAGS support

---- Files affected:
SOURCES:
   ppp-make.patch (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SOURCES/ppp-make.patch
diff -u SOURCES/ppp-make.patch:1.17 SOURCES/ppp-make.patch:1.18
--- SOURCES/ppp-make.patch:1.17	Sun Jul  9 13:35:54 2006
+++ SOURCES/ppp-make.patch	Fri Aug  4 03:07:29 2006
@@ -1,6 +1,6 @@
-diff -urN ppp-2.4.4.org/chat/Makefile.linux ppp-2.4.4/chat/Makefile.linux
---- ppp-2.4.4.org/chat/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/chat/Makefile.linux	2006-07-09 13:28:04.831141500 +0200
+diff -Nur ppp-2.4.4.orig/chat/Makefile.linux ppp-2.4.4.make/chat/Makefile.linux
+--- ppp-2.4.4.orig/chat/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
++++ ppp-2.4.4.make/chat/Makefile.linux	2006-08-04 02:58:35.000000000 +0200
 @@ -10,7 +10,7 @@
  CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
  CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
@@ -10,7 +10,15 @@
  CFLAGS=	$(COPTS) $(CDEFS)
  
  INSTALL= install
-@@ -25,7 +25,7 @@
+@@ -18,14 +18,14 @@
+ all:	chat
+ 
+ chat:	chat.o
+-	$(CC) -o chat chat.o
++	$(CC) $(OPTLDFLAGS) -o chat chat.o
+ 
+ chat.o:	chat.c
+ 	$(CC) -c $(CFLAGS) -o chat.o chat.c
  
  install: chat
  	mkdir -p $(BINDIR) $(MANDIR)
@@ -19,19 +27,20 @@
  	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
  
  clean:
-diff -urN ppp-2.4.4.org/pppd/Makefile.linux ppp-2.4.4/pppd/Makefile.linux
---- ppp-2.4.4.org/pppd/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/pppd/Makefile.linux	2006-07-09 13:29:38.368987250 +0200
-@@ -32,7 +32,7 @@
+diff -Nur ppp-2.4.4.orig/pppd/Makefile.linux ppp-2.4.4.make/pppd/Makefile.linux
+--- ppp-2.4.4.orig/pppd/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
++++ ppp-2.4.4.make/pppd/Makefile.linux	2006-08-04 02:59:50.000000000 +0200
+@@ -32,7 +32,8 @@
  
  # CC = gcc
  #
 -COPTS = -O2 -pipe -Wall -g
 +COPTS = $(OPT_FLAGS) -pipe -Wall -g
++LDFLAGS += $(OPTLDFLAGS)
  LIBS =
  
  # Uncomment the next 2 lines to include support for Microsoft's
-@@ -62,13 +62,13 @@
+@@ -62,13 +63,13 @@
  
  HAS_SHADOW=y
  #USE_PAM=y
@@ -47,7 +56,7 @@
  
  # Enable EAP SRP-SHA1 authentication (requires libsrp)
  #USE_SRP=y
-@@ -200,9 +200,7 @@
+@@ -200,9 +201,7 @@
  install: pppd
  	mkdir -p $(BINDIR) $(MANDIR)
  	$(EXTRAINSTALL)
@@ -58,19 +67,22 @@
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
  
  pppd: $(PPPDOBJS)
-diff -urN ppp-2.4.4.org/pppd/plugins/Makefile.linux ppp-2.4.4/pppd/plugins/Makefile.linux
---- ppp-2.4.4.org/pppd/plugins/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/Makefile.linux	2006-07-09 13:29:59.842329250 +0200
-@@ -1,5 +1,5 @@
+diff -Nur ppp-2.4.4.orig/pppd/plugins/Makefile.linux ppp-2.4.4.make/pppd/plugins/Makefile.linux
+--- ppp-2.4.4.orig/pppd/plugins/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
++++ ppp-2.4.4.make/pppd/plugins/Makefile.linux	2006-08-04 03:04:26.000000000 +0200
+@@ -1,7 +1,7 @@
  CC	= gcc
 -COPTS	= -O2 -g
 +COPTS	= $(OPT_FLAGS) -g
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
+-LDFLAGS	= -shared
++LDFLAGS	= $(OPTLDFLAGS) -shared
  INSTALL	= install
-diff -urN ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux ppp-2.4.4/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.4.org/pppd/plugins/radius/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/radius/Makefile.linux	2006-07-09 13:30:31.928334500 +0200
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+diff -Nur ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux
+--- ppp-2.4.4.orig/pppd/plugins/radius/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
++++ ppp-2.4.4.make/pppd/plugins/radius/Makefile.linux	2006-08-04 02:56:05.000000000 +0200
 @@ -12,7 +12,7 @@
  INSTALL	= install
  
@@ -93,9 +105,9 @@
  	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
  	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
  
-diff -urN ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.4.org/pppd/plugins/rp-pppoe/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux	2006-07-09 13:30:55.833828500 +0200
+diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux
+--- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
++++ ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux	2006-08-04 02:56:05.000000000 +0200
 @@ -24,7 +24,7 @@
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
  VERSION=3.3
@@ -114,9 +126,9 @@
  	$(INSTALL) -d -m 755 $(BINDIR)
  	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
  
-diff -urN ppp-2.4.4.org/pppdump/Makefile.linux ppp-2.4.4/pppdump/Makefile.linux
---- ppp-2.4.4.org/pppdump/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
-+++ ppp-2.4.4/pppdump/Makefile.linux	2006-07-09 13:31:16.499120000 +0200
+diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4.make/pppdump/Makefile.linux
+--- ppp-2.4.4.orig/pppdump/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
++++ ppp-2.4.4.make/pppdump/Makefile.linux	2006-08-04 03:05:39.000000000 +0200
 @@ -2,7 +2,7 @@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
@@ -126,16 +138,24 @@
  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
  
  INSTALL= install
-@@ -17,5 +17,5 @@
+@@ -10,12 +10,12 @@
+ all:	pppdump
+ 
+ pppdump: $(OBJS)
+-	$(CC) -o pppdump $(OBJS)
++	$(CC) $(OPTLDFLAGS) -o pppdump $(OBJS)
+ 
+ clean:
+ 	rm -f pppdump $(OBJS) *~
  
  install:
  	mkdir -p $(BINDIR) $(MANDIR)
 -	$(INSTALL) -s -c pppdump $(BINDIR)
 +	$(INSTALL) -c pppdump $(BINDIR)
  	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -urN ppp-2.4.4.org/pppstats/Makefile.linux ppp-2.4.4/pppstats/Makefile.linux
---- ppp-2.4.4.org/pppstats/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
-+++ ppp-2.4.4/pppstats/Makefile.linux	2006-07-09 13:31:41.380675000 +0200
+diff -Nur ppp-2.4.4.orig/pppstats/Makefile.linux ppp-2.4.4.make/pppstats/Makefile.linux
+--- ppp-2.4.4.orig/pppstats/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
++++ ppp-2.4.4.make/pppstats/Makefile.linux	2006-08-04 03:05:06.000000000 +0200
 @@ -10,7 +10,7 @@
  PPPSTATOBJS = pppstats.o
  
@@ -145,7 +165,7 @@
  COMPILE_FLAGS = -I../include
  LIBS =
  
-@@ -22,7 +22,7 @@
+@@ -22,11 +22,11 @@
  
  install: pppstats
  	-mkdir -p $(MANDIR)
@@ -154,3 +174,8 @@
  	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
  
  pppstats: $(PPPSTATSRCS)
+-	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
++	$(CC) $(CFLAGS) $(OPTLDFLAGS) -o pppstats pppstats.c $(LIBS)
+ 
+ clean:
+ 	rm -f pppstats *~ #* core
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ppp-make.patch?r1=1.17&r2=1.18&f=u

More information about the pld-cvs-commit mailing list