rpms/icecream/devel icecream-0.9.2-fix-gcc44-ftbfs.patch, 1.1, 1.2 icecream-rename-scheduler.patch, 1.1, 1.2 icecream.spec, 1.13, 1.14 icecream-build-env-as-root.patch, 1.1, NONE

Michal Schmidt michich at fedoraproject.org
Sat Feb 7 18:34:40 UTC 2009 

Author: michich

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

Modified Files:
	icecream-0.9.2-fix-gcc44-ftbfs.patch 
	icecream-rename-scheduler.patch icecream.spec 
Removed Files:
	icecream-build-env-as-root.patch 
Log Message:
* Sat Feb 07 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-4
- one more fix for gcc 4.4.
- updated the scheduler renaming patch.


icecream-0.9.2-fix-gcc44-ftbfs.patch:

Index: icecream-0.9.2-fix-gcc44-ftbfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream-0.9.2-fix-gcc44-ftbfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream-0.9.2-fix-gcc44-ftbfs.patch	7 Feb 2009 15:10:26 -0000	1.1
+++ icecream-0.9.2-fix-gcc44-ftbfs.patch	7 Feb 2009 18:34:39 -0000	1.2
@@ -19,3 +19,24 @@
  #include <string.h>
  #include <errno.h>
  #ifdef HAVE_SIGNAL_H
+
+
+commit 938fd86c096cfb82510e8d5c218c722f78170bc8
+Author: Michal Schmidt <mschmidt at redhat.com>
+Date:   Sat Feb 7 16:26:08 2009 +0100
+
+    fix invalid conversion from const pointer
+
+diff --git a/daemon/load.cpp b/daemon/load.cpp
+index 5cb1685..08e6f70 100644
+--- a/daemon/load.cpp
++++ b/daemon/load.cpp
+@@ -203,7 +203,7 @@ static void updateCPULoad( CPULoadInfo* load )
+ #ifndef USE_SYSCTL
+ static unsigned long int scan_one( const char* buff, const char *key )
+ {
+-  char *b = strstr( buff, key );
++  const char *b = strstr( buff, key );
+   if ( !b )
+       return 0;
+   unsigned long int val = 0;

icecream-rename-scheduler.patch:

Index: icecream-rename-scheduler.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream-rename-scheduler.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream-rename-scheduler.patch	8 Nov 2007 21:37:00 -0000	1.1
+++ icecream-rename-scheduler.patch	7 Feb 2009 18:34:39 -0000	1.2
@@ -1,20 +1,6 @@
---- services/Makefile.am.orig	2007-05-08 21:09:41.000000000 +0200
-+++ services/Makefile.am	2007-07-15 19:18:41.000000000 +0200
-@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
- noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
- icedir = $(includedir)/icecc
- 
--sbin_PROGRAMS = scheduler
--scheduler_SOURCES = scheduler.cpp
--scheduler_LDADD = libicecc.la
-+sbin_PROGRAMS = icecc-scheduler
-+icecc_scheduler_SOURCES = scheduler.cpp
-+icecc_scheduler_LDADD = libicecc.la
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = icecc.pc
---- doc/man-scheduler.1.docbook.orig	2005-04-25 15:21:14.000000000 +0200
-+++ doc/man-scheduler.1.docbook	2007-07-16 13:53:44.000000000 +0200
+diff -Nurp icecc-0.9.2.orig/doc/man-scheduler.1.docbook icecc-0.9.2/doc/man-scheduler.1.docbook
+--- icecc-0.9.2.orig/doc/man-scheduler.1.docbook	2009-02-07 19:07:02.000000000 +0100
++++ icecc-0.9.2/doc/man-scheduler.1.docbook	2009-02-07 19:07:30.000000000 +0100
 @@ -23,13 +23,13 @@
  </refmeta>
  
@@ -40,3 +26,79 @@
  </refsect1>
  
  <refsect1>
+diff -Nurp icecc-0.9.2.orig/services/Makefile.am icecc-0.9.2/services/Makefile.am
+--- icecc-0.9.2.orig/services/Makefile.am	2009-02-07 19:07:02.000000000 +0100
++++ icecc-0.9.2/services/Makefile.am	2009-02-07 19:07:30.000000000 +0100
+@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+ 
+-sbin_PROGRAMS = scheduler
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++sbin_PROGRAMS = icecc-scheduler
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+diff -Nurp icecc-0.9.2.orig/services/Makefile.in icecc-0.9.2/services/Makefile.in
+--- icecc-0.9.2.orig/services/Makefile.in	2008-11-02 14:14:47.000000000 +0100
++++ icecc-0.9.2/services/Makefile.in	2009-02-07 19:07:36.000000000 +0100
+@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-sbin_PROGRAMS = scheduler$(EXEEXT)
++sbin_PROGRAMS = icecc-scheduler$(EXEEXT)
+ subdir = services
+ DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/icecc.pc.in
+@@ -66,9 +66,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX 
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_scheduler_OBJECTS = scheduler.$(OBJEXT)
+-scheduler_OBJECTS = $(am_scheduler_OBJECTS)
+-scheduler_DEPENDENCIES = libicecc.la
++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT)
++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS)
++icecc_scheduler_DEPENDENCIES = libicecc.la
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -90,8 +90,8 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
+-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+ iceHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -226,8 +226,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
+ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+ all: all-am
+@@ -322,9 +322,9 @@ clean-sbinPROGRAMS:
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
+-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) 
+-	@rm -f scheduler$(EXEEXT)
+-	$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) 
++	@rm -f icecc-scheduler$(EXEEXT)
++	$(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- icecream.spec	7 Feb 2009 15:08:28 -0000	1.13
+++ icecream.spec	7 Feb 2009 18:34:39 -0000	1.14
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -77,7 +77,7 @@
 
 %prep
 %setup -q -a 8 -n icecc-%{version}
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
@@ -237,6 +237,10 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Sat Feb 07 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-4
+- one more fix for gcc 4.4.
+- updated the scheduler renaming patch.
+
 * Sat Feb 07 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.2-3
 - add an upstream patch to fix FTBFS with gcc 4.4
 


--- icecream-build-env-as-root.patch DELETED ---

More information about the scm-commits mailing list