Attachment 299253 Details for Bug 434014 – Patch to fix the build

[patch] Patch to fix the build

cman.patch (text/plain), 3.58 KB, created by Christopher Aillon on 2008-03-27 02:34:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Aillon

Created: 2008-03-27 02:34:21 UTC

Size: 3.58 KB

patch

obsolete

>? .build-2.0.60-4.fc9.log
>? clog
>? cman-2.0.60
>? cman-2.0.60-4.fc9.src.rpm
>? cman-2.0.60.tar.gz
>? cman.patch
>? my_requires
>? x86_64
>Index: cman-gcc43.patch
>===================================================================
>RCS file: cman-gcc43.patch
>diff -N cman-gcc43.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ cman-gcc43.patch	27 Mar 2008 02:29:51 -0000
>@@ -0,0 +1,55 @@
>+diff -up cman-2.0.60/fence/fence_tool/fence_tool.c.gcc43 cman-2.0.60/fence/fence_tool/fence_tool.c
>+--- cman-2.0.60/fence/fence_tool/fence_tool.c.gcc43	2008-03-26 22:05:09.000000000 -0400
>++++ cman-2.0.60/fence/fence_tool/fence_tool.c	2008-03-26 22:05:25.000000000 -0400
>+@@ -26,6 +26,7 @@
>+ #include <fcntl.h>
>+ #include <errno.h>
>+ #include <libgen.h>
>++#include <limits.h>
>+ 
>+ #include "ccs.h"
>+ #include "copyright.cf"
>+diff -up cman-2.0.60/cman/daemon/cmanccs.c.gcc43 cman-2.0.60/cman/daemon/cmanccs.c
>+--- cman-2.0.60/cman/daemon/cmanccs.c.gcc43	2006-12-15 10:17:13.000000000 -0500
>++++ cman-2.0.60/cman/daemon/cmanccs.c	2008-03-26 22:04:05.000000000 -0400
>+@@ -21,6 +21,7 @@
>+ #include <sys/errno.h>
>+ #include <netdb.h>
>+ #include <ifaddrs.h>
>++#include <limits.h>
>+ 
>+ #include "list.h"
>+ #include "cnxman-socket.h"
>+diff -up cman-2.0.60/cman/lib/libcman.c.gcc43 cman-2.0.60/cman/lib/libcman.c
>+--- cman-2.0.60/cman/lib/libcman.c.gcc43	2006-12-01 09:23:39.000000000 -0500
>++++ cman-2.0.60/cman/lib/libcman.c	2008-03-26 22:04:05.000000000 -0400
>+@@ -30,6 +30,7 @@
>+ #include <netinet/in.h>
>+ #include <string.h>
>+ #include <errno.h>
>++#include <limits.h>
>+ #include "cnxman-socket.h"
>+ #include "libcman.h"
>+ 
>+diff -up cman-2.0.60/ccs/daemon/cnx_mgr.c.gcc43 cman-2.0.60/ccs/daemon/cnx_mgr.c
>+--- cman-2.0.60/ccs/daemon/cnx_mgr.c.gcc43	2006-05-24 04:53:21.000000000 -0400
>++++ cman-2.0.60/ccs/daemon/cnx_mgr.c	2008-03-26 22:04:05.000000000 -0400
>+@@ -27,6 +27,7 @@
>+ #include <libxml/tree.h>
>+ #include <libxml/xpath.h>
>+ #include <libxml/xpathInternals.h>
>++#include <limits.h>
>+ 
>+ #include "log.h"
>+ #include "comm_headers.h"
>+diff -up cman-2.0.60/group/gfs_controld/lock_dlm.h.gcc43 cman-2.0.60/group/gfs_controld/lock_dlm.h
>+--- cman-2.0.60/group/gfs_controld/lock_dlm.h.gcc43	2006-12-20 14:16:21.000000000 -0500
>++++ cman-2.0.60/group/gfs_controld/lock_dlm.h	2008-03-26 22:04:05.000000000 -0400
>+@@ -21,6 +21,7 @@
>+ #include <string.h>
>+ #include <fcntl.h>
>+ #include <errno.h>
>++#include <limits.h>
>+ #include <time.h>
>+ #include <syslog.h>
>+ #include <sched.h>
>Index: cman.spec
>===================================================================
>RCS file: /cvs/extras/rpms/cman/devel/cman.spec,v
>retrieving revision 1.101
>diff -d -u -p -r1.101 cman.spec
>--- cman.spec	18 Feb 2008 22:24:22 -0000	1.101
>+++ cman.spec	27 Mar 2008 02:29:51 -0000
>@@ -23,7 +23,7 @@
> 
> Name: cman
> Version: %{cman_major}.%{cman_minor}
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> License: GPL
> Group: System Environment/Base
> Summary: cman - The Cluster Manager
>@@ -49,6 +49,7 @@ Patch0: cman-2.0.5-libraryfix.patch
> Patch1: cman-makefix.patch
> Patch2: cman-plocktemp.patch
> Patch3: cman-2.0.14-defaultrun.patch
>+Patch4: cman-gcc43.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> %description
>@@ -68,6 +69,7 @@ cman - The Cluster Manager
> %patch1 -p1 -b .makefix
> %patch2 -p1 -b .plock
> %patch3 -p1 -b .defaultrun
>+%patch4 -p1 -b .gcc43
> 
> %{__cat} <<EOF >%{my_requires}
> #!/bin/sh
>@@ -155,6 +157,9 @@ fi
> %{_libdir}/*.a
> 
> %changelog
>+* Wed Mar 26 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.60-5
>+- Fix build for GCC 4.3
>+
> * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.60-4
> - Autorebuild for GCC 4.3
>

Actions: View | Diff

Attachments on bug 434014: 299253