summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-04-23 13:21:58 +0400
committerRoman I Khimov <khimov@altell.ru>2010-04-23 22:49:06 +0400
commit2aafa2db54e25d23eb543fa59c2d67bcc6b9fe79 (patch)
treef1cc937885098b54e7609c366934e9fef3b2b6d2
parent41477e0b1d732b7e823f16fac150a7e89f8ba1b5 (diff)
cluster-resource-agents: fix uclibc build
Software stack protection is not available. Signed-off-by: Roman I Khimov <khimov@altell.ru>
-rw-r--r--recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch12
-rw-r--r--recipes/linux-ha/cluster-resource-agents_1.0.2.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch b/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch
new file mode 100644
index 0000000000..d6b02535a5
--- /dev/null
+++ b/recipes/linux-ha/cluster-resource-agents/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Cluster-Resource-Agents-agents-1.0.2/configure.in
+===================================================================
+--- Cluster-Resource-Agents-agents-1.0.2.orig/configure.in 2010-04-23 12:38:41.000000000 +0400
++++ Cluster-Resource-Agents-agents-1.0.2/configure.in 2010-04-23 12:38:49.000000000 +0400
+@@ -642,7 +642,6 @@
+ # Also remove -Waggregate-return because we use one libnet
+ # call which returns a struct
+ EXTRA_FLAGS="-fgnu89-inline
+- -fstack-protector-all
+ -Wall
+ -Wbad-function-cast
+ -Wcast-qual
diff --git a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb b/recipes/linux-ha/cluster-resource-agents_1.0.2.bb
index d90ae0fabf..1871eee4cd 100644
--- a/recipes/linux-ha/cluster-resource-agents_1.0.2.bb
+++ b/recipes/linux-ha/cluster-resource-agents_1.0.2.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "OCF resource agents for use by compatible cluster managers"
LICENSE = "GPL"
DEPENDS = "cluster-glue"
-PR = "r2"
+PR = "r3"
SRC_URI = " \
http://hg.linux-ha.org/agents/archive/agents-${PV}.tar.bz2;name=tar \
file://fix-header-defs-lookup.patch;patch=1 \
file://disable-doc-build.patch;patch=1 \
"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;patch=1"
SRC_URI[tar.md5sum] = "b536dea1b1f642bdc3607cb85ea0b89d"
SRC_URI[tar.sha256sum] = "c5a1ea9a83c578672cd475ab4af5c2e40736669bae0eb70bb9bb6124074e5e5e"