summaryrefslogtreecommitdiffstats
path: root/recipes/pacemaker
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/pacemaker')
-rw-r--r--recipes/pacemaker/files/kill-stack-protector.patch12
-rw-r--r--recipes/pacemaker/pacemaker_1.0.8.bb3
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/pacemaker/files/kill-stack-protector.patch b/recipes/pacemaker/files/kill-stack-protector.patch
new file mode 100644
index 0000000000..a9f5b83bb2
--- /dev/null
+++ b/recipes/pacemaker/files/kill-stack-protector.patch
@@ -0,0 +1,12 @@
+Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac
+===================================================================
+--- Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac 2010-05-06 13:43:17.000000000 +0400
++++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-05-06 13:43:20.000000000 +0400
+@@ -1302,7 +1302,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/pacemaker/pacemaker_1.0.8.bb b/recipes/pacemaker/pacemaker_1.0.8.bb
index 1cbbda3baf..11b4ca2da2 100644
--- a/recipes/pacemaker/pacemaker_1.0.8.bb
+++ b/recipes/pacemaker/pacemaker_1.0.8.bb
@@ -16,7 +16,7 @@ DEPENDS = " \
"
RDEPENDS_${PN} += "openais"
-PR = "r3"
+PR = "r4"
SRC_URI = " \
http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2;name=tar \
@@ -25,6 +25,7 @@ SRC_URI = " \
file://fix-header-defs-lookup.patch;patch=1 \
file://volatiles \
"
+SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch;patch=1"
SRC_URI[tar.md5sum] = "088569ca893fe9f2239b68abe2856132"
SRC_URI[tar.sha256sum] = "07e2e5559720890603baac96aa7635ff02f0b33ead592977554e661c6afe7b55"
inherit autotools_stage python-dir