summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mhatle@windriver.com>2010-08-06 11:40:55 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-12 15:47:02 +0100
commit1c9f061d1f855cd0ecdcd3449e1f9bf45a7de0ee (patch)
tree0512b90ff03277fc90a7803ae5a271b704fb9696 /meta
parente101642a61fc418273c1cd4d58a9564b4bdecc5c (diff)
downloadpoky-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')
-rw-r--r--meta/classes/sanity.bbclass5
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/packages/pseudo/pseudo_git.bb6
3 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 31b8dd2b07..a595224a7f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -143,6 +143,11 @@ def check_sanity(e):
143 if data.getVar('SDK_ARCH', e.data, True) == 'i686': 143 if data.getVar('SDK_ARCH', e.data, True) == 'i686':
144 messages = messages + '"Please set SDKMACHINE to i586. It is currently defaulting to the build machine architecture of i686 and this is known to have issues (see local.conf).\n' 144 messages = messages + '"Please set SDKMACHINE to i586. It is currently defaulting to the build machine architecture of i686 and this is known to have issues (see local.conf).\n'
145 145
146 nolibs = data.getVar('NO32LIBS', e.data, True)
147 if not nolibs:
148 if os.path.exists('/lib/libc.so.6') and not os.path.exists('/usr/include/gnu/stubs-32.h'):
149 messages = messages + "You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n"
150
146 # 151 #
147 # Check that TMPDIR hasn't changed location since the last time we were run 152 # Check that TMPDIR hasn't changed location since the last time we were run
148 # 153 #
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index fe3e8bbf08..190296abf3 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -110,7 +110,7 @@ PRELINKSRCREV ??= "909470ee441237563d6236c505cb2d02ddc48704"
110SRCREV_pn-prelink ??= "${PRELINKSRCREV}" 110SRCREV_pn-prelink ??= "${PRELINKSRCREV}"
111SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" 111SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}"
112SRCREV_pn-psplash ??= "424" 112SRCREV_pn-psplash ??= "424"
113PSEUDOSRCREV ??= "551bf567c171c9f6f475f02de80e35df9563dce7" 113PSEUDOSRCREV ??= "5d027f78a6e677e9272a17555a83124026e6fb08"
114SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" 114SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}"
115SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" 115SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}"
116QEMUSRCREV ??= "72bb3c7571226af13cfe9eec020a56add3d30a70" 116QEMUSRCREV ??= "72bb3c7571226af13cfe9eec020a56add3d30a70"
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"
6DEPENDS = "sqlite3" 6DEPENDS = "sqlite3"
7 7
8PV = "0.0+git${SRCPV}" 8PV = "0.0+git${SRCPV}"
9PR = "r12" 9PR = "r13"
10 10
11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ 11SRC_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}