From d1b2d92a9246104f38b1ef87d3aca014524cde72 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 30 Sep 2010 23:52:00 -0700 Subject: [PATCH] cluster-glue_1.0.5.bb: Fix build warnings found with gcc 4.5 Signed-off-by: Khem Raj --- .../cluster-glue/fix-const-cast.patch | 27 +++++++++++++++++++ recipes/linux-ha/cluster-glue_1.0.5.bb | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 recipes/linux-ha/cluster-glue/fix-const-cast.patch diff --git a/recipes/linux-ha/cluster-glue/fix-const-cast.patch b/recipes/linux-ha/cluster-glue/fix-const-cast.patch new file mode 100644 index 0000000000..6532caa100 --- /dev/null +++ b/recipes/linux-ha/cluster-glue/fix-const-cast.patch @@ -0,0 +1,27 @@ +This patch gets rid of new warning introduced with gcc 4.5 +Warning is explained here +http://gcc.gnu.org/viewcvs/trunk/gcc/doc/invoke.texi?r1=148037&r2=148053&diff_format=h + + +Index: Reusable-Cluster-Components-glue-1.0.5/lib/plugins/stonith/apcsmart.c +=================================================================== +--- Reusable-Cluster-Components-glue-1.0.5.orig/lib/plugins/stonith/apcsmart.c ++++ Reusable-Cluster-Components-glue-1.0.5/lib/plugins/stonith/apcsmart.c +@@ -708,7 +708,6 @@ apcsmart_status(StonithPlugin * s) + /* + * return the list of hosts configured for this device + */ +- + static char ** + apcsmart_hostlist(StonithPlugin * s) + { +@@ -719,7 +718,8 @@ apcsmart_hostlist(StonithPlugin * s) + } + ERRIFNOTCONFIGED(s,NULL); + +- return OurImports->CopyHostList((const char **)ad->hostlist); ++/* return OurImports->CopyHostList((const char **)(ad->hostlist));*/ ++ return OurImports->CopyHostList((__extension__(union {char ** a; const char** b;})(ad->hostlist)).b); + } + + static gboolean diff --git a/recipes/linux-ha/cluster-glue_1.0.5.bb b/recipes/linux-ha/cluster-glue_1.0.5.bb index 66f0b0b91f..7207a6398e 100644 --- a/recipes/linux-ha/cluster-glue_1.0.5.bb +++ b/recipes/linux-ha/cluster-glue_1.0.5.bb @@ -6,11 +6,12 @@ is not the cluster messaging layer (Heartbeat), nor the cluster resource manager LICENSE = "GPL" DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux-ng" -PR = "r1" +PR = "r2" SRC_URI = " \ http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2;name=tar \ file://glue-remove-getpid-check.patch \ + file://fix-const-cast.patch \ file://volatiles \ " SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch" -- 2.39.5