diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-07-26 12:59:49 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 15:45:47 +0100 |
commit | eb7cd0c2712aea9b274c3d49bdb020aa3e4e5894 (patch) | |
tree | d46b95c290c5f372902060dfdd115c210d409174 /meta | |
parent | 911dc39eef7b1f9c88b90d03d23aaab11ace16ab (diff) | |
download | poky-eb7cd0c2712aea9b274c3d49bdb020aa3e4e5894.tar.gz |
beecrypt: Fix multilib header conflict - beecrypt/gnu.h
beecrypt/gnu.h conflicts between 32-bit and 64-bit versions.
(From OE-Core rev: f520b91f878bb16b4b351ddb5f2240e318181044)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb index f6606413b1..2913b46f10 100644 --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | |||
@@ -17,11 +17,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \ | |||
17 | 17 | ||
18 | DEPENDS = "icu" | 18 | DEPENDS = "icu" |
19 | 19 | ||
20 | PR = "r0" | 20 | PR = "r1" |
21 | 21 | ||
22 | inherit autotools | 22 | inherit autotools multilib_header |
23 | acpaths="" | 23 | acpaths="" |
24 | 24 | ||
25 | do_install_append() { | ||
26 | oe_multilib_header beecrypt/gnu.h | ||
27 | } | ||
28 | |||
25 | EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp" | 29 | EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp" |
26 | 30 | ||
27 | FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*" | 31 | FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*" |