summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-07 12:17:10 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-07 15:16:31 +0100
commit7e46fc81d4907bef974a7234db84f8177aefd82c (patch)
tree2ea4f93a4e396b88ed5d7c2a5ad08e07f5a0e588
parent647713050b091e55497aee5647b6d0d0abc08411 (diff)
downloadpoky-7e46fc81d4907bef974a7234db84f8177aefd82c.tar.gz
pseudo: Honour the NO32LIBS variable
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 4cb483ea60..55055fa0d3 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/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 = "r14" 9PR = "r15"
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"
@@ -22,8 +22,10 @@ do_configure () {
22 : 22 :
23} 23}
24 24
25NO32LIBS ??= "0"
26
25do_compile () { 27do_compile () {
26 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then 28 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
27 # We need the 32-bit libpseudo on a 64-bit machine... 29 # We need the 32-bit libpseudo on a 64-bit machine...
28 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 30 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
29 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo 31 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
@@ -36,7 +38,7 @@ do_compile () {
36 38
37do_install () { 39do_install () {
38 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install 40 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install
39 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then 41 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
40 mkdir -p ${D}${prefix}/lib/pseudo/lib 42 mkdir -p ${D}${prefix}/lib/pseudo/lib
41 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. 43 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
42 fi 44 fi