* [gentoo-commits] gentoo-x86 commit in sys-cluster/ipvsadm/files: ipvsadm-1.27-buildsystem.patch
@ 2013-11-02 6:40 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-11-02 6:40 UTC (permalink / raw
To: gentoo-commits
robbat2 13/11/02 06:40:02
Added: ipvsadm-1.27-buildsystem.patch
Log:
New release. Upstream has moved to kernel.org; update the build system fixes to apply.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.1 sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.1&content-type=text/plain
Index: ipvsadm-1.27-buildsystem.patch
===================================================================
diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/libipvs/Makefile ipvsadm-1.27/libipvs/Makefile
--- ipvsadm-1.27.orig/libipvs/Makefile 2013-09-06 01:37:27.000000000 -0700
+++ ipvsadm-1.27/libipvs/Makefile 2013-11-01 23:31:14.359495884 -0700
@@ -1,9 +1,9 @@
# Makefile for libipvs
CC = gcc
-CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC
+#OPTFLAGS = -Wall -Wunused -Wstrict-prototypes
ifneq (0,$(HAVE_NL))
-CFLAGS += -DLIBIPVS_USE_NL
+DEFINES += -DLIBIPVS_USE_NL
CFLAGS += $(shell \
if which pkg-config > /dev/null 2>&1; then \
if pkg-config --cflags libnl-3.0 2> /dev/null; then :; \
@@ -15,7 +15,7 @@
INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \
echo "-I../../."; fi;)
-DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \
+DEFINES += $(shell if [ ! -f ../../ip_vs.h ]; then \
echo "-DHAVE_NET_IP_VS_H"; fi;)
DEFINES += $(shell if which pkg-config > /dev/null 2>&1; then \
if pkg-config --exists libnl-3.0; then :; \
@@ -24,21 +24,31 @@
then echo "-DFALLBACK_LIBNL1"; fi; fi)
.PHONY = all clean install dist distclean rpm rpms
+
STATIC_LIB = libipvs.a
SHARED_LIB = libipvs.so
-all: $(STATIC_LIB) $(SHARED_LIB)
+TARGETS = $(SHARED_LIB)
+ifeq (1,$(STATIC))
+TARGETS += $(STATIC_LIB)
+endif
+all: $(TARGETS)
+
+SOURCES = libipvs.c ip_vs_nl_policy.c
-$(STATIC_LIB): libipvs.o ip_vs_nl_policy.o
+$(STATIC_LIB): $(SOURCES:%.c=%.o)
ar rv $@ $^
-$(SHARED_LIB): libipvs.o ip_vs_nl_policy.o
- $(CC) -shared -Wl,-soname,$@ -o $@ $^
+$(SHARED_LIB): $(SOURCES:%.c=%.lo)
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
+
+%.lo: %.c
+ $(CC) -fPIC $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
%.o: %.c
- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
clean:
- rm -f *.[ao] *~ *.orig *.rej core *.so
+ rm -f *.[ao] *~ *.orig *.rej core *.so *.lo
distclean: clean
diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile ipvsadm-1.27/Makefile
--- ipvsadm-1.27.orig/Makefile 2013-09-06 01:37:27.000000000 -0700
+++ ipvsadm-1.27/Makefile 2013-11-01 23:31:44.259015958 -0700
@@ -43,14 +43,13 @@
INIT = $(BUILD_ROOT)/etc/rc.d/init.d
MKDIR = mkdir
INSTALL = install
-STATIC_LIBS = libipvs/libipvs.a
ifeq "${ARCH}" "sparc64"
- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
+ CFLAGS := -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
else
- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
+ CFLAGS := -g
endif
-
+OPTFLAGS += -Wall -Wunused -Wstrict-prototypes
#####################################
# No servicable parts below this line
@@ -84,12 +83,14 @@
all: libs ipvsadm
libs:
- make -C libipvs
+ $(MAKE) -C libipvs
+
+$(OBJS): libs
-ipvsadm: $(OBJS) $(STATIC_LIBS)
- $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+ipvsadm: $(OBJS)
+ $(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS)
-install: all
+install:
if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
$(INSTALL) -m 0755 ipvsadm $(SBIN)
$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
@@ -98,15 +99,13 @@
$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
- [ -d $(INIT) ] || $(MKDIR) -p $(INIT)
- $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
clean:
rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
rm -rf debian/tmp
find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \
-o -name "*.rej" -o -name core | xargs rm -f
- make -C libipvs clean
+ $(MAKE) -C libipvs clean
distclean: clean
@@ -139,4 +138,4 @@
dpkg-buildpackage
%.o: %.c
- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-cluster/ipvsadm/files: ipvsadm-1.27-buildsystem.patch
@ 2013-11-02 6:52 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-11-02 6:52 UTC (permalink / raw
To: gentoo-commits
robbat2 13/11/02 06:52:16
Modified: ipvsadm-1.27-buildsystem.patch
Log:
Respin build system patch into a form for submission to upstream.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2 sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?r1=1.1&r2=1.2
Index: ipvsadm-1.27-buildsystem.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- ipvsadm-1.27-buildsystem.patch 2 Nov 2013 06:40:02 -0000 1.1
+++ ipvsadm-1.27-buildsystem.patch 2 Nov 2013 06:52:16 -0000 1.2
@@ -1,6 +1,6 @@
diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/libipvs/Makefile ipvsadm-1.27/libipvs/Makefile
--- ipvsadm-1.27.orig/libipvs/Makefile 2013-09-06 01:37:27.000000000 -0700
-+++ ipvsadm-1.27/libipvs/Makefile 2013-11-01 23:31:14.359495884 -0700
++++ ipvsadm-1.27/libipvs/Makefile 2013-11-01 23:45:21.633636401 -0700
@@ -1,9 +1,9 @@
# Makefile for libipvs
@@ -61,8 +61,8 @@ diff -Nuar -Nuar --exclude '*.orig' --ex
distclean: clean
diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile ipvsadm-1.27/Makefile
---- ipvsadm-1.27.orig/Makefile 2013-09-06 01:37:27.000000000 -0700
-+++ ipvsadm-1.27/Makefile 2013-11-01 23:31:44.259015958 -0700
+--- ipvsadm-1.27.orig/Makefile 2013-11-01 23:49:36.523225124 -0700
++++ ipvsadm-1.27/Makefile 2013-11-01 23:49:09.478738760 -0700
@@ -43,14 +43,13 @@
INIT = $(BUILD_ROOT)/etc/rc.d/init.d
MKDIR = mkdir
@@ -96,19 +96,11 @@ diff -Nuar -Nuar --exclude '*.orig' --ex
+ $(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS)
-install: all
-+install:
++install: all
if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
$(INSTALL) -m 0755 ipvsadm $(SBIN)
$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
-@@ -98,15 +99,13 @@
- $(INSTALL) -m 0644 ipvsadm.8 $(MAN)
- $(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
- $(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
-- [ -d $(INIT) ] || $(MKDIR) -p $(INIT)
-- $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
-
- clean:
- rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
+@@ -106,7 +107,7 @@
rm -rf debian/tmp
find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \
-o -name "*.rej" -o -name core | xargs rm -f
@@ -117,7 +109,7 @@ diff -Nuar -Nuar --exclude '*.orig' --ex
distclean: clean
-@@ -139,4 +138,4 @@
+@@ -139,4 +140,4 @@
dpkg-buildpackage
%.o: %.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-cluster/ipvsadm/files: ipvsadm-1.27-buildsystem.patch
@ 2013-11-02 6:57 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2013-11-02 6:57 UTC (permalink / raw
To: gentoo-commits
robbat2 13/11/02 06:57:10
Modified: ipvsadm-1.27-buildsystem.patch
Log:
Slightly more buildsystem improvement.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.3 sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch?r1=1.2&r2=1.3
Index: ipvsadm-1.27-buildsystem.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- ipvsadm-1.27-buildsystem.patch 2 Nov 2013 06:52:16 -0000 1.2
+++ ipvsadm-1.27-buildsystem.patch 2 Nov 2013 06:57:10 -0000 1.3
@@ -86,7 +86,7 @@ diff -Nuar -Nuar --exclude '*.orig' --ex
libs:
- make -C libipvs
-+ $(MAKE) -C libipvs
++ $(MAKE) -C libipvs CFLAGS="$(CFLAGS)" STATIC="$(STATIC)" OPTFLAGS="$(OPTFLAGS)"
+
+$(OBJS): libs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-02 6:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-02 6:57 [gentoo-commits] gentoo-x86 commit in sys-cluster/ipvsadm/files: ipvsadm-1.27-buildsystem.patch Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2013-11-02 6:52 Robin H. Johnson (robbat2)
2013-11-02 6:40 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox