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
---
 package/ipset/patches/patch-Makefile | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/ipset/patches/patch-Makefile

(limited to 'package/ipset/patches/patch-Makefile')

diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile
new file mode 100644
index 000000000..e97a5b6a0
--- /dev/null
+++ b/package/ipset/patches/patch-Makefile
@@ -0,0 +1,36 @@
+--- ipset-4.1.orig/Makefile	2009-11-11 20:22:42.000000000 +0100
++++ ipset-4.1/Makefile	2011-01-21 13:30:47.148658311 +0100
+@@ -64,9 +64,13 @@ ifndef NO_EXTRA_WARN_FLAGS
+ endif
+ 
+ ABI_FLAGS:=
+-CFLAGS:=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG
++CPPFLAGS?=
++CPPFLAGS+=-Ikernel/include -I.
++CFLAGS?=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS)
+ SH_CFLAGS:=$(CFLAGS) -fPIC
+-LDFLAGS:=$(ABI_FLAGS)
++LDFLAGS?=$(ABI_FLAGS)
++LIBS?=
++LIBS+=-ldl
+ SETTYPES:=ipmap portmap macipmap
+ SETTYPES+=iptree iptreemap
+ SETTYPES+=iphash nethash ipporthash ipportiphash ipportnethash
+@@ -114,14 +118,14 @@ release: clean
+ 
+ #The ipset(8) self
+ ipset.o: ipset.c ipset.h
+-	$(CC) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -DIPSET_VERSION=\"$(IPSET_VERSION)\" -DIPSET_LIB_DIR=\"$(IPSET_LIB_DIR)\" -c -o $@ $<
+ 
+ ipset: ipset.o
+-	$(CC) $(CFLAGS) $(LDFLAGS) -rdynamic -o $@ $^ -ldl
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ #Pooltypes
+ ipset_%.o: ipset_%.c ipset.h
+-	$(CC) $(SH_CFLAGS) -o $@ -c $<
++	$(CC) $(CPPFLAGS) $(SH_CFLAGS) -o $@ -c $<
+ 
+ libipset_%.so: ipset_%.o
+ 	$(CC) -shared $(LDFLAGS) -o $@ $<
-- 
cgit v1.2.3