diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:37:50 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-22 22:37:50 +0100 |
commit | 9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch) | |
tree | adb1937bc90be8869a5f7c9636da84773414eb3b /package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux | |
parent | 52b1b0100c53b1f8699955df618fcb47744e0a7e (diff) |
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use
TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ...
* activate GCC_HONOUR_COPTS and fix all packages to
honour CFLAGS
* use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all
build compilation, remove HOST* variants
* introduce KERNEL_MODULE_FLAGS for external kernel
modules
* mark rpm package as broken, mark syslinux for native builds
only, mark libhugetlb for eglibc/glibc only usage
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_linux | 64 |
1 files changed, 30 insertions, 34 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 index 09d845f6a..844525b54 100644 --- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux +++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_Makefile_linux @@ -1,50 +1,51 @@ --- 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 @@ ++++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-21 21:29:58.318658312 +0100 +@@ -1,6 +1,4 @@ -# Generated automatically from Makefile.in by configure. --#*********************************************************************** + #*********************************************************************** -# # Makefile # # Makefile for Roaring Penguin's Linux PPPoE plugin. -@@ -13,52 +10,50 @@ - # +@@ -14,51 +12,35 @@ # $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) -- ++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) + -INSTALL = install -+include ../../../makedefs.linux ++include ../../../Makedefs.com # 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)"' ++CPPFLAGS += -I../../../include -I../../.. ++CPPFLAGS += '-DRP_VERSION="$(RP_VERSION)"' ++ifeq (,$(filter -fPIC,$(CFLAGS))) +CFLAGS += -fPIC ++endif ++ifeq (,$(filter -shared,$(LDFLAGS))) +LDFLAGS += -shared -+ -+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ++endif + 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 +- +-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 +- +-debug.o: debug.c - $(CC) $(CFLAGS) -c -o debug.o debug.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ ++ $(CC) $(LDFLAGS) -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 @@ -53,28 +54,23 @@ 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) $(STRIP) -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) ++ $(INSTALL) $(STRIP) -c -m 555 pppoe-discovery $(BINDIR) clean: rm -f *.o *.so pppoe-discovery - - plugin.o: plugin.c +- +-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 +- +-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 +- +-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 +- +-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 +- |