public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schmidt <michich@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/icecream] epel9: - one more fix for gcc 4.4.
Date: Thu, 30 Jul 2026 15:34:02 GMT [thread overview]
Message-ID: <178542564205.1.1460149420247313018.rpms-icecream-aa93b14e568c@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/icecream
Branch : epel9
Commit : aa93b14e568cc234fa870640b5f8978d9ee0dcc2
Author : Michal Schmidt <michich@fedoraproject.org>
Date : 2009-02-07T18:34:39+00:00
Stats : +106/-42 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/icecream/c/aa93b14e568cc234fa870640b5f8978d9ee0dcc2?branch=epel9
Log:
- one more fix for gcc 4.4.
- updated the scheduler renaming patch.
---
diff --git a/icecream-0.9.2-fix-gcc44-ftbfs.patch b/icecream-0.9.2-fix-gcc44-ftbfs.patch
index ef21409..ce9fabb 100644
--- a/icecream-0.9.2-fix-gcc44-ftbfs.patch
+++ b/icecream-0.9.2-fix-gcc44-ftbfs.patch
@@ -19,3 +19,24 @@ index 0df255e..2d29a8a 100644
#include <string.h>
#include <errno.h>
#ifdef HAVE_SIGNAL_H
+
+
+commit 938fd86c096cfb82510e8d5c218c722f78170bc8
+Author: Michal Schmidt <mschmidt@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;
diff --git a/icecream-build-env-as-root.patch b/icecream-build-env-as-root.patch
deleted file mode 100644
index f3ccf2b..0000000
--- a/icecream-build-env-as-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-icecc --build-native fails if run as non-root, it needs to chroot.
-This needs to be discussed upstream.
-
-diff -up icecc-0.9.2/daemon/environment.cpp.build-env-as-root icecc-0.9.2/daemon/environment.cpp
---- icecc-0.9.2/daemon/environment.cpp.build-env-as-root 2008-11-13 15:11:28.000000000 +0100
-+++ icecc-0.9.2/daemon/environment.cpp 2008-11-13 15:12:26.000000000 +0100
-@@ -239,6 +239,7 @@ size_t setup_env_cache(const string &bas
- }
- }
- // else
-+ /* icecc --build-native wants to ldconfig -r ... which uses chroot
- if ( setgid( nobody_gid ) < 0) {
- log_perror("setgid failed");
- _exit(143);
-@@ -246,7 +247,7 @@ size_t setup_env_cache(const string &bas
- if (!geteuid() && setuid( nobody_uid ) < 0) {
- log_perror("setuid failed");
- _exit (142);
-- }
-+ }*/
-
- if ( chdir( nativedir.c_str() ) ) {
- log_perror( "chdir" );
diff --git a/icecream-rename-scheduler.patch b/icecream-rename-scheduler.patch
index 0f8c9bc..ddbc455 100644
--- a/icecream-rename-scheduler.patch
+++ b/icecream-rename-scheduler.patch
@@ -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.@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)
diff --git a/icecream.spec b/icecream.spec
index 68a161f..3d88a67 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -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 @@ This package contains development files for %{name}.
%prep
%setup -q -a 8 -n icecc-%{version}
-%patch0 -p0
+%patch0 -p1
%patch1 -p0
%patch2 -p1
%patch3 -p1
@@ -237,6 +237,10 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/icecc.pc
%changelog
+* Sat Feb 07 2009 Michal Schmidt <mschmidt@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@redhat.com> - 0.9.2-3
- add an upstream patch to fix FTBFS with gcc 4.4
reply other threads:[~2026-07-30 15:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178542564205.1.1460149420247313018.rpms-icecream-aa93b14e568c@fedoraproject.org \
--to=michich@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox