diff options
| author | Mark Hatle <Mark.Hatle@windriver.com> | 2010-08-06 06:54:38 -0700 |
|---|---|---|
| committer | Mark Hatle <Mark.Hatle@windriver.com> | 2010-08-06 06:56:03 -0700 |
| commit | 2c2e5dc14677c0c10cf1eaedb7207be58a2ec4cb (patch) | |
| tree | 4142d6a8669c1445d4939975c551ca845eca2f95 | |
| parent | 4e2c84f6b4d200e35afc7fff1b39de85afb480af (diff) | |
| download | openembedded-core-2c2e5dc14677c0c10cf1eaedb7207be58a2ec4cb.tar.gz openembedded-core-2c2e5dc14677c0c10cf1eaedb7207be58a2ec4cb.tar.bz2 openembedded-core-2c2e5dc14677c0c10cf1eaedb7207be58a2ec4cb.zip | |
pseudo: Enable dual 32-bit and 64-bit support
On an x86_64 host, both 32-bit and 64-bit libraries need to be generated.
It is fairly common that a user will have at least a few 32-bit programs
on their x86_64 host system, so a pseudo wrapper for 32-bit is required
to allow those programs to be successfully wrapped.
Signed-off-by: Mark Hatle <Mark.Hatle@windriver.com>
| -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 78d1720501..020c8380b4 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" |