diff options
-rw-r--r-- | meta/packages/pseudo/pseudo_git.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/packages/pseudo/pseudo_git.bb b/meta/packages/pseudo/pseudo_git.bb index 020c8380b4..d393967ceb 100644 --- a/meta/packages/pseudo/pseudo_git.bb +++ b/meta/packages/pseudo/pseudo_git.bb | |||
@@ -23,12 +23,12 @@ do_configure () { | |||
23 | } | 23 | } |
24 | 24 | ||
25 | do_compile () { | 25 | do_compile () { |
26 | if [ "${SITEINFO_BITS}" == "64" ]; 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' |
30 | # prevent it from removing the lib, but keep everything else | 30 | # prevent it from removing the lib, but keep 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} |
34 | oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' | 34 | oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' |
@@ -36,9 +36,9 @@ do_compile () { | |||
36 | 36 | ||
37 | do_install () { | 37 | do_install () { |
38 | oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install | 38 | oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install |
39 | if [ "${SITEINFO_BITS}" == "64" ]; then | 39 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then |
40 | mkdir -p ${D}${prefix}/lib/pseudo/lib | 40 | mkdir -p ${D}${prefix}/lib/pseudo/lib |
41 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. | 41 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. |
42 | fi | 42 | fi |
43 | } | 43 | } |
44 | 44 | ||