From 9436a026e2e23d207fbdcb9e8bc9b076e3573700 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Jan 2011 22:37:50 +0100
Subject: 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
---
 .../patch-pppd_plugins_pppol2tp_Makefile_linux     | 36 ++++++++++++----------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux')

diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
index 4c46c5971..481f1e41c 100644
--- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
@@ -1,41 +1,45 @@
 --- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2011-01-16 21:32:19.000000000 +0100
-@@ -1,13 +1,10 @@
++++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux	2011-01-21 21:30:05.208658673 +0100
+@@ -1,29 +1,27 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
 -CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
 -LDFLAGS	= -shared
 -INSTALL	= install
-+include ../../../makedefs.linux
++VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
 -#***********************************************************************
-+CPPFLAGS += -I. -I../.. -I../../../include
-+#CFLAGS += -fPIC
-+#LDFLAGS	+= -shared
++include ../../../Makedefs.com
  
 -DESTDIR = @DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
++CPPFLAGS += -I. -I../.. -I../../../include
++ifeq (,$(filter -fPIC,$(CFLAGS)))
++CFLAGS += -fPIC
++endif
++ifeq (,$(filter -shared,$(LDFLAGS)))
++LDFLAGS += -shared
++endif
+ 
+-VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
 +#***********************************************************************
  
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+ PLUGINS := pppol2tp.so openl2tp.so
  
-@@ -16,7 +13,11 @@ PLUGINS := pppol2tp.so openl2tp.so
  all: $(PLUGINS)
  
  %.so: %.o
 -	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+	echo $(LDFLAGS)
-+
-+%.o: %.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
  
- install: all
+-install: all
++install: $(PLUGINS)
  	$(INSTALL) -d -m 755 $(LIBDIR)
-@@ -25,5 +26,4 @@ install: all
+-	$(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
++	$(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR)
+ 
  clean:
  	rm -f *.o *.so
- 
+-
 -%.o: %.c
 -	$(CC) $(CFLAGS) -c -o $@ $<
-+.PHONY: clean
-- 
cgit v1.2.3