From 42dd254f5937274f164a5a7c5fb3c1f80e38e7af Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 27 Jul 2012 10:45:02 +0200
Subject: full build on Darwin fixes

---
 package/ipvsadm/patches/patch-Makefile.orig        | 43 ----------------------
 .../ipvsadm/patches/patch-libipvs_Makefile.orig    | 20 ----------
 2 files changed, 63 deletions(-)
 delete mode 100644 package/ipvsadm/patches/patch-Makefile.orig
 delete mode 100644 package/ipvsadm/patches/patch-libipvs_Makefile.orig

(limited to 'package/ipvsadm')

diff --git a/package/ipvsadm/patches/patch-Makefile.orig b/package/ipvsadm/patches/patch-Makefile.orig
deleted file mode 100644
index 95c55e00a..000000000
--- a/package/ipvsadm/patches/patch-Makefile.orig
+++ /dev/null
@@ -1,43 +0,0 @@
---- ipvsadm-1.26.orig/Makefile	2011-02-08 01:24:23.000000000 +0100
-+++ ipvsadm-1.26/Makefile	2012-07-20 14:42:03.000000000 +0200
-@@ -35,7 +35,7 @@ ARCH		= $(shell uname -m)
- RPMSOURCEDIR	= $(shell rpm --eval '%_sourcedir')
- RPMSPECDIR	= $(shell rpm --eval '%_specdir')
- 
--CC		= gcc
-+CC		?= gcc
- INCLUDE		=
- SBIN		= $(BUILD_ROOT)/sbin
- MANDIR		= usr/man
-@@ -46,9 +46,9 @@ INSTALL		= install
- STATIC_LIBS	= libipvs/libipvs.a
- 
- ifeq "${ARCH}" "sparc64"
--    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
-+    CFLAGS ?= -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
- else
--    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
-+    CFLAGS ?= -Wall -Wunused -Wstrict-prototypes -g
- endif
- 
- 
-@@ -81,7 +81,7 @@ endif
- OBJS		= ipvsadm.o config_stream.o dynamic_array.o
- LIBS		= $(POPT_LIB)
- ifneq (0,$(HAVE_NL))
--LIBS		+= -lnl
-+LIBS		+= -lnl-3
- endif
- DEFINES		= -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \
- 		  -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
-@@ -96,8 +96,8 @@ all:            libs ipvsadm
- libs:
- 		make -C libipvs
- 
--ipvsadm:	$(OBJS) $(STATIC_LIBS)
--		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+ipvsadm:	$(OBJS)
-+		$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -lpopt -lipvs -L./libipvs
- 
- install:        all
- 		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
diff --git a/package/ipvsadm/patches/patch-libipvs_Makefile.orig b/package/ipvsadm/patches/patch-libipvs_Makefile.orig
deleted file mode 100644
index e40aa2c2a..000000000
--- a/package/ipvsadm/patches/patch-libipvs_Makefile.orig
+++ /dev/null
@@ -1,20 +0,0 @@
---- ipvsadm-1.26.orig/libipvs/Makefile	2008-09-21 12:02:03.000000000 +0200
-+++ ipvsadm-1.26/libipvs/Makefile	2012-07-20 13:53:07.000000000 +0200
-@@ -1,7 +1,7 @@
- # Makefile for libipvs
- 
--CC		= gcc
--CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
-+CC		?= gcc
-+CFLAGS		?= -Wall -Wunused -Wstrict-prototypes -g -fPIC
- ifneq (0,$(HAVE_NL))
- CFLAGS		+= -DLIBIPVS_USE_NL
- endif
-@@ -19,6 +19,7 @@ all:		$(STATIC_LIB) $(SHARED_LIB)
- 
- $(STATIC_LIB):	libipvs.o ip_vs_nl_policy.o
- 		ar rv $@ $^
-+		ranlib $^
- 
- $(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
- 		$(CC) -shared -Wl,-soname,$@ -o $@ $^
-- 
cgit v1.2.3