summaryrefslogtreecommitdiff
path: root/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux')
-rw-r--r--package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux80
1 files changed, 80 insertions, 0 deletions
diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
new file mode 100644
index 000000000..09d845f6a
--- /dev/null
+++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux
@@ -0,0 +1,80 @@
+--- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100
++++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-16 21:38:08.000000000 +0100
+@@ -1,6 +1,3 @@
+-# Generated automatically from Makefile.in by configure.
+-#***********************************************************************
+-#
+ # Makefile
+ #
+ # Makefile for Roaring Penguin's Linux PPPoE plugin.
+@@ -13,52 +10,50 @@
+ #
+ # $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $
+ #***********************************************************************
+-
+-DESTDIR = $(INSTROOT)@DESTDIR@
+-BINDIR = $(DESTDIR)/sbin
+-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
+-
+-PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+-
+-INSTALL = install
++include ../../../makedefs.linux
+
+ # Version is set ONLY IN THE MAKEFILE! Don't delete this!
+ RP_VERSION=3.8p
+
+-COPTS=-O2 -g
+-CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
++CPPFLAGS += -I../../.. -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
++CFLAGS += -fPIC
++LDFLAGS += -shared
++
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
++
+ all: rp-pppoe.so pppoe-discovery
+
+ pppoe-discovery: pppoe-discovery.o debug.o
+- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o
++ $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
+
+ pppoe-discovery.o: pppoe-discovery.c
+- $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
+
+ debug.o: debug.c
+- $(CC) $(CFLAGS) -c -o debug.o debug.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
+
+ rp-pppoe.so: plugin.o discovery.o if.o common.o
+- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
++ $(CC) $(LDFLAGS) -o $@ $^
+
+ install: all
+ $(INSTALL) -d -m 755 $(LIBDIR)
+- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
++ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
+ $(INSTALL) -d -m 755 $(BINDIR)
+- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
++ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
+
+ clean:
+ rm -f *.o *.so pppoe-discovery
+
+ plugin.o: plugin.c
+- $(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o plugin.o plugin.c
+
+ discovery.o: discovery.c
+- $(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o discovery.o discovery.c
+
+ if.o: if.c
+- $(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o if.o if.c
+
+ common.o: common.c
+- $(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
+
++.PHONY: clean