rpms/tanukiwrapper/F-12 tanukiwrapper-Makefile-sparc-sparc64.patch, NONE, 1.1 tanukiwrapper.spec, 1.32, 1.33

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/tanukiwrapper/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10777

Modified Files:
	tanukiwrapper.spec 
Added Files:
	tanukiwrapper-Makefile-sparc-sparc64.patch 
Log Message:
add path with sparc makefile support


tanukiwrapper-Makefile-sparc-sparc64.patch:
 Makefile-linux-sparc-32   |   39 +++++++++++++++++++++++++++++++++++++++
 Makefile-linux-sparc64-64 |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

--- NEW FILE tanukiwrapper-Makefile-sparc-sparc64.patch ---
--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32	2009-10-15 19:40:08.633904530 +0000
+++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32	2009-10-26 00:29:29.000000000 +0000
@@ -0,0 +1,39 @@
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -mcpu=ultrasparc -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64	2009-10-15 19:40:08.633904530 +0000
+++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64	2009-10-26 00:28:26.000000000 +0000
@@ -0,0 +1,41 @@
+# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+# If you know how to fix it then please help out.
+COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mcpu=ultrasparc -fPIC -Wall --pedantic
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/F-12/tanukiwrapper.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- tanukiwrapper.spec	31 Jul 2009 17:17:50 -0000	1.32
+++ tanukiwrapper.spec	26 Oct 2009 03:28:23 -0000	1.33
@@ -34,7 +34,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.3
-Release:	4.4%{?dist}
+Release:	5%{?dist}
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD
@@ -45,9 +45,10 @@ Patch2:		%{name}-crosslink.patch
 Patch3:		%{name}-makefile-linux-x86-32.patch
 #Add Makefiles so package builds for all FC architectures.
 Patch4:		%{name}-Makefile-s390-s390x-ppc.patch
+Patch5:         %{name}-Makefile-sparc-sparc64.patch
 # The following patch is only needed for GCJ.
-Patch5:		%{name}-nosun-jvm-64.patch
-Patch6:     %{name}-compilewithfpic.patch
+Patch6:		%{name}-nosun-jvm-64.patch
+Patch7:     %{name}-compilewithfpic.patch
 Group:		Development/Java
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	glibc-devel
@@ -103,11 +104,12 @@ Group:          Development/Documentatio
 %patch2
 %patch3
 %patch4
+%patch5 -p1
 # The following patch is only needed for GCJ.
 %if %{gcj_support}
-%patch5
-%endif
 %patch6
+%endif
+%patch7
 find . -name "*.jar" -exec %__rm -f {} \;
 %__perl -p -i -e 's/\r//' doc/AUTHORS
 %__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile*
@@ -204,6 +206,9 @@ fi
 %doc doc/*
 
 %changelog
+* sun Oct 25 2009 Dennis Gilmore <dennis at ausil.us> - 0:3.2.3-5
+- add patch with sparc support
+
 * Fri Jul 31 2009 Deepak Bhole <dbhole at redhat.com> - 0:3.2.3-4.4
 - Fix bug #480189 Compile files with -fPIC