diff options
author | Mark Hatle <mhatle@windriver.com> | 2010-08-06 11:40:55 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-12 15:47:02 +0100 |
commit | 1c9f061d1f855cd0ecdcd3449e1f9bf45a7de0ee (patch) | |
tree | 0512b90ff03277fc90a7803ae5a271b704fb9696 /meta/packages | |
parent | e101642a61fc418273c1cd4d58a9564b4bdecc5c (diff) | |
download | poky-1c9f061d1f855cd0ecdcd3449e1f9bf45a7de0ee.tar.gz |
pseudo: Upgrade pseudo and correct problems
Fix an issue where pseudo could try to compile incorrectly on an
x86_64 host system. Now it verifies that it should be trying to build
a 32-bit library, and if so the necessary prereqs are available.
Also uprev to the latest version of pseudo changes to enable wrapping
of execl, local variable storage and misc fixes.
Signed-off-by: Mark Hatle <mhatle@windriver.com>
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/pseudo/pseudo_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/pseudo/pseudo_git.bb b/meta/packages/pseudo/pseudo_git.bb index d393967ceb..eac398ed12 100644 --- a/meta/packages/pseudo/pseudo_git.bb +++ b/meta/packages/pseudo/pseudo_git.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "LGPL2.1" | |||
6 | DEPENDS = "sqlite3" | 6 | DEPENDS = "sqlite3" |
7 | 7 | ||
8 | PV = "0.0+git${SRCPV}" | 8 | PV = "0.0+git${SRCPV}" |
9 | PR = "r12" | 9 | PR = "r13" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ | 11 | SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ |
12 | file://static_sqlite.patch" | 12 | file://static_sqlite.patch" |
@@ -26,8 +26,8 @@ do_compile () { | |||
26 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then | 26 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then |
27 | # We need the 32-bit libpseudo on a 64-bit machine... | 27 | # We need the 32-bit libpseudo on a 64-bit machine... |
28 | ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 | 28 | ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 |
29 | oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' | 29 | oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo |
30 | # prevent it from removing the lib, but keep everything else | 30 | # prevent it from removing the lib, but remove everything else |
31 | make 'LIB=foo' distclean | 31 | make 'LIB=foo' distclean |
32 | fi | 32 | fi |
33 | ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} | 33 | ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} |