rpms/gcc/devel gcc.spec,1.102,1.103 gcc45-hack.patch,1.1,1.2

Jakub Jelinek jakub at fedoraproject.org
Fri Jul 9 11:25:39 UTC 2010


Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv533

Modified Files:
	gcc.spec gcc45-hack.patch 
Log Message:
4.5.0-2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gcc.spec	9 Jul 2010 08:48:52 -0000	1.102
+++ gcc.spec	9 Jul 2010 11:25:38 -0000	1.103
@@ -1966,6 +1966,7 @@ fi
 	target/43888, tree-optimization/44284
 - use DW_OP_const[48]u instead of DW_OP_addr before DW_OP_GNU_push_tls_address
 - fix a multilib issue with *.py[oc] files in libstdc++ (#612742)
+- fix up libgcj_bc.so
 
 * Wed Jun  7 2010 Jakub Jelinek <jakub at redhat.com> 4.5.0-1
 - initial 4.5 package, using newly created redhat/gcc-4_5-branch

gcc45-hack.patch:
 config-ml.in         |    1 +
 gcc/ada/make.adb     |    1 +
 gcc/ada/sem_util.adb |    6 +++++-
 libada/Makefile.in   |   32 +++++++++++++++++++++++++++-----
 libjava/Makefile.am  |    3 ++-
 libjava/Makefile.in  |    3 ++-
 6 files changed, 38 insertions(+), 8 deletions(-)

Index: gcc45-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc45-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcc45-hack.patch	7 Jul 2010 17:35:20 -0000	1.1
+++ gcc45-hack.patch	9 Jul 2010 11:25:38 -0000	1.2
@@ -97,3 +97,27 @@
  				GCJFLAGS="$(GCJFLAGS) $${flags}" \
  				CXXFLAGS="$(CXXFLAGS) $${flags}" \
  				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
+--- libjava/Makefile.am.jj	2010-07-09 11:17:33.729604090 +0200
++++ libjava/Makefile.am	2010-07-09 13:16:41.894375641 +0200
+@@ -710,7 +710,8 @@ if USE_LIBGCJ_BC
+ ## later.
+ 	@echo Installing dummy lib libgcj_bc.so.1.0.0; \
+ 	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+-	mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++	$(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
+ 	$(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+ 	-o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+ 	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+--- libjava/Makefile.in.jj	2010-07-09 11:17:34.000000000 +0200
++++ libjava/Makefile.in	2010-07-09 13:18:07.542572270 +0200
+@@ -12665,7 +12665,8 @@ install-exec-hook: install-binPROGRAMS i
+ 	install-libexecsubPROGRAMS
+ @USE_LIBGCJ_BC_TRUE@	@echo Installing dummy lib libgcj_bc.so.1.0.0; \
+ @USE_LIBGCJ_BC_TRUE@	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+- at USE_LIBGCJ_BC_TRUE@	mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++ at USE_LIBGCJ_BC_TRUE@	$(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++ at USE_LIBGCJ_BC_TRUE@	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
+ @USE_LIBGCJ_BC_TRUE@	$(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+ @USE_LIBGCJ_BC_TRUE@	-o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+ @USE_LIBGCJ_BC_TRUE@	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \



More information about the scm-commits mailing list