rpms/tanukiwrapper/devel tanukiwrapper-compilewithfpic.patch, NONE, 1.1 tanukiwrapper-Makefile-s390-s390x-ppc.patch, 1.1, 1.2 tanukiwrapper.spec, 1.31, 1.32

Deepak Bhole dbhole at fedoraproject.org
Fri Jul 31 17:17:50 UTC 2009


Author: dbhole

Update of /cvs/pkgs/rpms/tanukiwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22996

Modified Files:
	tanukiwrapper-Makefile-s390-s390x-ppc.patch tanukiwrapper.spec 
Added Files:
	tanukiwrapper-compilewithfpic.patch 
Log Message:

- Fix bug #480189 Compile files with -fPIC





tanukiwrapper-compilewithfpic.patch:
 Makefile-linux-ppc-64 |    2 +-
 Makefile-linux-x86-32 |    2 +-
 Makefile-linux-x86-64 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tanukiwrapper-compilewithfpic.patch ---
diff -up ./src/c/Makefile-linux-ppc-64.sav ./src/c/Makefile-linux-ppc-64
--- ./src/c/Makefile-linux-ppc-64.sav	2009-07-31 12:18:21.000000000 -0400
+++ ./src/c/Makefile-linux-ppc-64	2009-07-31 12:18:31.000000000 -0400
@@ -33,7 +33,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \
diff -up ./src/c/Makefile-linux-x86-32.sav ./src/c/Makefile-linux-x86-32
--- ./src/c/Makefile-linux-x86-32.sav	2009-07-31 12:17:28.000000000 -0400
+++ ./src/c/Makefile-linux-x86-32	2009-07-31 12:19:11.000000000 -0400
@@ -31,7 +31,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \
diff -up ./src/c/Makefile-linux-x86-64.sav ./src/c/Makefile-linux-x86-64
--- ./src/c/Makefile-linux-x86-64.sav	2009-07-31 12:17:40.000000000 -0400
+++ ./src/c/Makefile-linux-x86-64	2009-07-31 12:19:41.000000000 -0400
@@ -33,7 +33,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \

tanukiwrapper-Makefile-s390-s390x-ppc.patch:
 Makefile-linux-ppc-32   |   41 +++++++++++++++++++++++++++++++++++++++++
 Makefile-linux-s390-32  |   39 +++++++++++++++++++++++++++++++++++++++
 Makefile-linux-s390x-64 |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+)

Index: tanukiwrapper-Makefile-s390-s390x-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/devel/tanukiwrapper-Makefile-s390-s390x-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tanukiwrapper-Makefile-s390-s390x-ppc.patch	4 Aug 2006 23:02:25 -0000	1.1
+++ tanukiwrapper-Makefile-s390-s390x-ppc.patch	31 Jul 2009 17:17:50 -0000	1.2
@@ -34,7 +34,7 @@
 +
 +%.o: %.c
 +	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \
@@ -76,7 +76,7 @@
 +
 +%.o: %.c
 +	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \
@@ -120,7 +120,7 @@
 +
 +%.o: %.c
 +	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -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/$$/ :/' \


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- tanukiwrapper.spec	27 Jul 2009 05:31:42 -0000	1.31
+++ tanukiwrapper.spec	31 Jul 2009 17:17:50 -0000	1.32
@@ -34,7 +34,7 @@
 
 Name:		tanukiwrapper
 Version:	3.2.3
-Release:	4.3%{?dist}
+Release:	4.4%{?dist}
 Summary:	Java Service Wrapper
 Epoch:		0
 License:	BSD
@@ -47,6 +47,7 @@ Patch3:		%{name}-makefile-linux-x86-32.p
 Patch4:		%{name}-Makefile-s390-s390x-ppc.patch
 # The following patch is only needed for GCJ.
 Patch5:		%{name}-nosun-jvm-64.patch
+Patch6:     %{name}-compilewithfpic.patch
 Group:		Development/Java
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	glibc-devel
@@ -106,6 +107,7 @@ Group:          Development/Documentatio
 %if %{gcj_support}
 %patch5
 %endif
+%patch6
 find . -name "*.jar" -exec %__rm -f {} \;
 %__perl -p -i -e 's/\r//' doc/AUTHORS
 %__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile*
@@ -202,6 +204,9 @@ fi
 %doc doc/*
 
 %changelog
+* Fri Jul 31 2009 Deepak Bhole <dbhole at redhat.com> - 0:3.2.3-4.4
+- Fix bug #480189 Compile files with -fPIC
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.2.3-4.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list