Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1469 mails)

< Previous Next >
commit icecream for openSUSE:Factory
Hello community,

here is the log from the commit of package icecream for openSUSE:Factory
checked in at 2012-03-23 11:48:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icecream (Old)
and /work/SRC/openSUSE:Factory/.icecream.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icecream", Maintainer is "coolo@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/icecream/icecream.changes 2011-09-23
02:03:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icecream.new/icecream.changes 2012-03-23
11:49:01.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Mar 22 18:03:02 CET 2012 - dmueller@xxxxxxx
+
+- make linux 3 based kernel hosts incompatible with the rest, just
+ as a workaround for glibc becoming incompatble
+
+-------------------------------------------------------------------

New:
----
treat-linux3-as-separate-platform.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icecream.spec ++++++
--- /var/tmp/diff_new_pack.4BdbU8/_old 2012-03-23 11:49:04.000000000 +0100
+++ /var/tmp/diff_new_pack.4BdbU8/_new 2012-03-23 11:49:04.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icecream
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,17 +14,16 @@

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0


Name: icecream
BuildRequires: gcc-c++
+Summary: For Distributed Compile in the Network
License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Tools/Building
-Summary: For Distributed Compile in the Network
-Requires: /bin/tar /usr/bin/bzip2
+Requires: /bin/tar
+Requires: /usr/bin/bzip2
%if 0%{?suse_version}
PreReq: %fillup_prereq
PreReq: %insserv_prereq
@@ -32,19 +31,20 @@
PreReq: /usr/sbin/useradd /usr/sbin/groupadd
Requires: gcc-c++
Version: 0.9.7
-Release: 1
+Release: 0
Source0:
ftp://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2
Source1: %name-manpages.tar.bz2
+Patch0: treat-linux3-as-separate-platform.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
icecream is the next generation distcc.

%package -n libicecream-devel
-License: GPL-2.0+ ; LGPL-2.1+
Summary: For Distributed Compile in the Network
Group: Development/Tools/Building
Summary: For Distributed Compile in the Network
+Group: Development/Tools/Building
Requires: libstdc++-devel

%description -n libicecream-devel
@@ -52,6 +52,7 @@

%prep
%setup -q -a 1 -n icecc-%{version}
+%patch0

%build
export CFLAGS="$RPM_OPT_FLAGS"

++++++ treat-linux3-as-separate-platform.diff ++++++
--- services/platform.cpp
+++ services/platform.cpp
@@ -38,17 +38,25 @@
}

string os = uname_buf.sysname;
+ const std::string release = uname_buf.release;
+ const string::size_type pos = release.find( '.' );
+
if ( os == "Darwin" ) {
- const std::string release = uname_buf.release;
- const string::size_type pos = release.find( '.' );
if ( pos == string::npos )
throw( std::string( "determine_platform: Cannot determine Darwin
release from release string \"" ) + release + "\"" );
os += release.substr( 0, pos );
}
+
if ( os != "Linux" )
platform = os + '_' + uname_buf.machine;
- else // Linux
- platform = uname_buf.machine;
+ else {
+ // Linux
+ if (release.substr(0, pos) != "2") {
+ platform = string("Linux") + release.substr( 0, pos ) + '_' +
uname_buf.machine;
+ }
+ else
+ platform = uname_buf.machine;
+ }

while (true)
{
--- services/scheduler.cpp
+++ services/scheduler.cpp
@@ -1,5 +1,6 @@
/* -*- mode: C++; c-file-style: "gnu"; fill-column: 78 -*- */
-/* vim:cinoptions={.5s,g0,p5,t0,(0,^-0.5s,n-0.5s:tw=78:cindent:sw=4: */
+/* vim:cinoptions={.5s,g0,p5,t0,(0,^-0.5s,n-0.5s:tw=78:cindent:sw=4:
+ */
/*
This file is part of Icecream.

@@ -579,24 +580,37 @@

static multimap<string, string> platform_map;

+ const char* const compat_platforms[] = { "", "Linux3_" };
+
if (platform_map.empty())
{
- platform_map.insert( make_pair( string( "i386" ), string( "i486" ) ) );
- platform_map.insert( make_pair( string( "i386" ), string( "i586" ) ) );
- platform_map.insert( make_pair( string( "i386" ), string( "i686" ) ) );
- platform_map.insert( make_pair( string( "i386" ), string( "x86_64" ) ) );
-
- platform_map.insert( make_pair( string( "i486" ), string( "i586" ) ) );
- platform_map.insert( make_pair( string( "i486" ), string( "i686" ) ) );
- platform_map.insert( make_pair( string( "i486" ), string( "x86_64" ) ) );
-
- platform_map.insert( make_pair( string( "i586" ), string( "i686" ) ) );
- platform_map.insert( make_pair( string( "i586" ), string( "x86_64" ) ) );
-
- platform_map.insert( make_pair( string( "i686" ), string( "x86_64" ) ) );
+ for (int j = 0; j < sizeof(compat_platforms); ++j)
+ {
+ for (int i = 0; i < sizeof(compat_platforms); ++i)
+ {

- platform_map.insert( make_pair( string( "ppc" ), string( "ppc64" ) ) );
- platform_map.insert( make_pair( string( "s390" ), string( "s390x" ) ) );
+ // Linux3_xxx is not compatible with xxx
+ if (j == 1 && i == 0)
+ continue;
+
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i386" ), string(compat_platforms[j]) + string( "i486" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i386" ), string(compat_platforms[j]) + string( "i586" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i386" ), string(compat_platforms[j]) + string( "i686" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i386" ), string(compat_platforms[j]) + string( "x86_64" ) ) );
+
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i486" ), string(compat_platforms[j]) + string( "i586" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i486" ), string(compat_platforms[j]) + string( "i686" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i486" ), string(compat_platforms[j]) + string( "x86_64" ) ) );
+
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i586" ), string(compat_platforms[j]) + string( "i686" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i586" ), string(compat_platforms[j]) + string( "x86_64" ) ) );
+
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "i686" ), string(compat_platforms[j]) + string( "x86_64" ) ) );
+
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "ppc" ), string(compat_platforms[j]) + string( "ppc64" ) ) );
+ platform_map.insert( make_pair( string(compat_platforms[i]) +
string( "s390" ), string(compat_platforms[j]) + string( "s390x" ) ) );
+ }
+ }
}

multimap<string, string>::const_iterator end = platform_map.upper_bound(
target );
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages