rpms/tanukiwrapper/F-11 tanukiwrapper-compilewithfpic.patch, NONE, 1.1 tanukiwrapper.spec, 1.30, 1.31
Deepak Bhole
dbhole at fedoraproject.org
Fri Jul 31 18:35:11 UTC 2009
Author: dbhole
Update of /cvs/pkgs/rpms/tanukiwrapper/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18687
Modified Files:
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/$$/ :/' \
Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tanukiwrapper/F-11/tanukiwrapper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- tanukiwrapper.spec 25 Feb 2009 18:28:55 -0000 1.30
+++ tanukiwrapper.spec 31 Jul 2009 18:35:11 -0000 1.31
@@ -34,7 +34,7 @@
Name: tanukiwrapper
Version: 3.2.3
-Release: 3.3%{?dist}
+Release: 3.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-3.4
+- Fix bug #480189 Compile files with -fPIC
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:3.2.3-3.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list