diff options
| -rw-r--r-- | meta/packages/pseudo/pseudo_git.bb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/meta/packages/pseudo/pseudo_git.bb b/meta/packages/pseudo/pseudo_git.bb index 78d172050..020c8380b 100644 --- a/meta/packages/pseudo/pseudo_git.bb +++ b/meta/packages/pseudo/pseudo_git.bb @@ -6,7 +6,7 @@ LICENSE = "LGPL2.1" DEPENDS = "sqlite3" PV = "0.0+git${SRCPV}" -PR = "r11" +PR = "r12" SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ file://static_sqlite.patch" @@ -19,15 +19,27 @@ S = "${WORKDIR}/git" inherit siteinfo do_configure () { - ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} + : } do_compile () { - oe_runmake 'LIB=lib/pseudo/lib' + if [ "${SITEINFO_BITS}" == "64" ]; then + # We need the 32-bit libpseudo on a 64-bit machine... + ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 + oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' + # prevent it from removing the lib, but keep everything else + make 'LIB=foo' distclean + fi + ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} + oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' } do_install () { - oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib' install + oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install + if [ "${SITEINFO_BITS}" == "64" ]; then + mkdir -p ${D}${prefix}/lib/pseudo/lib + cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. + fi } BBCLASSEXTEND = "native" |