summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-09-28 23:21:09 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-29 16:54:39 +0100
commitbd3ac21f14785ad426f3ead8995c5c8292537743 (patch)
tree7b10885bf3ef2652b5c8ac30ef8832914de50e03
parent8418fe82f14dc4500f195eb5aa15e053b7e28c0e (diff)
downloadpoky-bd3ac21f14785ad426f3ead8995c5c8292537743.tar.gz
Fix sysklogd build on e500v2 cores
(From OE-Core rev: 5035097bb369dc1740b817734b92bcfa40d95d22) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysklogd/files/no-vectorization.patch20
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_1.5.bb2
3 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysklogd/files/no-vectorization.patch b/meta/recipes-extended/sysklogd/files/no-vectorization.patch
new file mode 100644
index 0000000000..c1cc042c9c
--- /dev/null
+++ b/meta/recipes-extended/sysklogd/files/no-vectorization.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Inappropriate
2
3The compiler should not be generating vectorized instructions on this target.
4This is a work around until I can determine why this is occuring on this
5particular recipe
6
7Index: sysklogd-1.5/Makefile
8===================================================================
9--- sysklogd-1.5.orig/Makefile
10+++ sysklogd-1.5/Makefile
11@@ -20,7 +20,8 @@
12 CC= gcc
13 #SKFLAGS= -g -DSYSV -Wall
14 #LDFLAGS= -g
15-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
16+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce \
17+ -fno-tree-vectorize
18 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
19 # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
20 # $(shell getconf LFS_SKFLAGS)
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 891dd3b80f..0b84dace96 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -22,6 +22,8 @@ SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar
22 file://syslog.conf \ 22 file://syslog.conf \
23 " 23 "
24 24
25SRC_URI_append_e500v2 = " file://no-vectorization.patch"
26
25INITSCRIPT_NAME = "syslog" 27INITSCRIPT_NAME = "syslog"
26CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${PN}" 28CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${PN}"
27 29
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index f17c5a2c7c..187c9f49b6 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
1require sysklogd.inc 1require sysklogd.inc
2PR = "r3" 2PR = "r4"
3 3
4SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b" 4SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
5SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773" 5SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"