From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 23 Apr 2010 09:20:42 +0000 (+0400)
Subject: cluster-glue: fix uclibc build
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41477e0b1d732b7e823f16fac150a7e89f8ba1b5;p=openembedded.git

cluster-glue: fix uclibc build

Stack protection is not available.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---

diff --git a/recipes/linux-ha/cluster-glue/kill-stack-protector.patch b/recipes/linux-ha/cluster-glue/kill-stack-protector.patch
new file mode 100644
index 0000000000..25a21f4f17
--- /dev/null
+++ b/recipes/linux-ha/cluster-glue/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Reusable-Cluster-Components-glue-1.0.3/configure.ac
+===================================================================
+--- Reusable-Cluster-Components-glue-1.0.3.orig/configure.ac	2010-04-23 12:35:52.000000000 +0400
++++ Reusable-Cluster-Components-glue-1.0.3/configure.ac	2010-04-23 12:36:00.000000000 +0400
+@@ -1135,7 +1135,6 @@
+ 
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+         EXTRA_FLAGS="-fgnu89-inline
+-		-fstack-protector-all
+ 		-Wall
+ 		-Waggregate-return
+ 		-Wbad-function-cast 
diff --git a/recipes/linux-ha/cluster-glue_1.0.3.bb b/recipes/linux-ha/cluster-glue_1.0.3.bb
index 774b83c09e..f13950069a 100644
--- a/recipes/linux-ha/cluster-glue_1.0.3.bb
+++ b/recipes/linux-ha/cluster-glue_1.0.3.bb
@@ -6,11 +6,14 @@ 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"
+
 SRC_URI = " \
 	http://hg.linux-ha.org/glue/archive/glue-${PV}.tar.bz2;name=tar \
 	file://glue-remove-getpid-check.patch;patch=1 \
 	file://volatiles \
 	"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;patch=1"
 SRC_URI[tar.md5sum] = "f13746a8f3e8db1fa9c682d9db892573"
 SRC_URI[tar.sha256sum] = "fb1e4b75779849daf0f2c2c93668dd2a33d304307554f3d617b07f1957c61c9f"