SOURCES: magma-optflags.patch (NEW) - OPTCFLAGS and LDFLAGS support

[sparky]

Author: sparky                       Date: Thu Aug  3 02:02:14 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- OPTCFLAGS and LDFLAGS support

---- Files affected:
SOURCES:
   magma-optflags.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/magma-optflags.patch
diff -u /dev/null SOURCES/magma-optflags.patch:1.1
--- /dev/null	Thu Aug  3 04:02:14 2006
+++ SOURCES/magma-optflags.patch	Thu Aug  3 04:02:09 2006
@@ -0,0 +1,67 @@
+diff -Nur cluster-1.02.00/magma/lib/Makefile cluster-1.02.00/magma.optflags/lib/Makefile
+--- cluster-1.02.00/magma/lib/Makefile	2005-11-14 23:34:00.000000000 +0100
++++ cluster-1.02.00/magma.optflags/lib/Makefile	2006-08-03 03:59:32.000000000 +0200
+@@ -27,7 +27,7 @@
+ 	libmagmamsg.so
+ 
+ INCLUDE=-I.
+-CFLAGS+=-g -Werror -Wstrict-prototypes -Wshadow \
++CFLAGS+=$(OPTCFLAGS) -Werror -Wstrict-prototypes -Wshadow \
+ 	-fPIC -DPLUGINDIR=\"${plugindir}\" \
+ 	-D_GNU_SOURCE
+ 
+@@ -96,14 +96,14 @@
+ 
+ libmagma.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): global.o plugin.o \
+ 			localinfo.o ip_lookup.o memberlist.o clist.o
+-	${CC} -shared -o $@ $^ -lpthread -ldl -Wl,-soname,libmagma.so.$(RELEASE_MAJOR)
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -lpthread -ldl -Wl,-soname,libmagma.so.$(RELEASE_MAJOR)
+ 
+ libmagma_nt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): plugin.o localinfo.o \
+ 			ip_lookup.o memberlist.o
+-	${CC} -shared -o $@ $^ -ldl -Wl,-soname,libmagma_nt.so.$(RELEASE_MAJOR)
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -Wl,-soname,libmagma_nt.so.$(RELEASE_MAJOR)
+ 
+ libmagmamsg.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): message.o fdops.o libmagma.so
+-	${CC} -shared -o $@ $^ -Wl,-Bdynamic,-soname,libmagmamsg.so.$(RELEASE_MAJOR) -L. -lmagma -lpthread -ldl
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-Bdynamic,-soname,libmagmamsg.so.$(RELEASE_MAJOR) -L. -lmagma -lpthread -ldl
+ 
+ libmagma.a: global.o plugin.o localinfo.o ip_lookup.o \
+ 		        memberlist.o clist.o
+diff -Nur cluster-1.02.00/magma/tests/Makefile cluster-1.02.00/magma.optflags/tests/Makefile
+--- cluster-1.02.00/magma/tests/Makefile	2005-01-28 20:36:18.000000000 +0100
++++ cluster-1.02.00/magma.optflags/tests/Makefile	2006-08-03 03:59:32.000000000 +0200
+@@ -18,7 +18,7 @@
+ LIBSNT   = -L${top_srcdir}/lib -lmagma_nt -ldl
+ TARGETS  = magma_tool circleping cluster_cmd
+ TESTS    = cptester thread_test
+-CFLAGS  += -DDEBUG -D_GNU_SOURCE -DPLUGINDIR=\"${plugindir}\" \
++CFLAGS  += $(OPTCFLAGS) -D_GNU_SOURCE -DPLUGINDIR=\"${plugindir}\" \
+ 	   -DINCDIR=\"${incdir}\" -DLIBDIR=\"${libdir}\" \
+ 	   -DSLIBDIR=\"${slibdir}\"
+ 
+@@ -32,19 +32,19 @@
+ 	${UNINSTALL} ${TARGETS} ${sbindir}
+ 
+ circleping: circleping.o
+-	$(CC) -o $@ $^ $(LIBS) -ggdb
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -ggdb
+ 
+ cluster_cmd: cluster_cmd.o
+-	$(CC) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ magma_tool: magma_tool.o
+-	$(CC) -o $@ $^ $(LIBS) -ggdb
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -ggdb
+ 
+ cptester: cptester.o
+-	$(CC) -o $@ $^ $(LIBSNT)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBSNT)
+ 
+ thread_test: thread_test.o
+-	$(CC) -o $@ $^ $(LIBS) -ggdb
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -ggdb
+ 
+ 
+ %.o: %.c
================================================================