[OE-core] [PATCH 1/1] pseudo.inc: Fix sqlite libdir again, pseudo 1.4.3
Martin Jansa
martin.jansa at gmail.com
Fri Feb 1 10:29:35 UTC 2013
On Thu, Jan 31, 2013 at 04:00:25PM -0600, Peter Seebach wrote:
> This updates to pseudo 1.4.3. Changes:
>
> 1. A couple of minor tweaks to reduce difficulties using SDKs built
> on slightly more recent machines on older machines; specifically,
> avoiding getting @GLIBC_2.7 symbol references for sscanf(), fscanf(),
> and open2().
> 2. Revision of the logic determining the library directory to use for
> sqlite's library files.
>
> The latter is a source of difficulty because it's come up a few times
> that we may want pseudo to use lib64 for libpseudo.so, but bitbake's
> usual setup would have libsqlite3.a in lib regardless of bit width.
> Cleaned up previous design a bit by providing a distinct setting for
> sqlite-lib, which defaults to the same library directory used for other
> things. Adjusted build to use this new setting.
>
> Testing: Successful build of meta-toolchain for both 64-bit and 32-bit
> SDKMACHINE, and builds with NO32LIBS = "0" also succeeded.
Interesting that this patch didn't make it to patchwork:
http://patchwork.openembedded.org/project/oe-core/list/?state=*&q=pseudo&archive=both
and it's not one of known cases where patchwork does not work (e.g.
renames only with -M).
Peter can you check this issue:
http://lists.linuxtogo.org/pipermail/openembedded-core/2013-January/035089.html
to confirm or disprove that it could be somehow caused by pseudo?
I'll try it with 1.4.3 just in case :).
Regards,
> Signed-off-by: Peter Seebach <peter.seebach at windriver.com>
> ---
> meta/recipes-devtools/pseudo/pseudo.inc | 8 ++++----
> meta/recipes-devtools/pseudo/pseudo_1.4.1.bb | 8 --------
> meta/recipes-devtools/pseudo/pseudo_1.4.3.bb | 8 ++++++++
> meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++--
> 4 files changed, 14 insertions(+), 14 deletions(-)
> delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
> create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.3.bb
>
> diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
> index 98f706c..8dd9842 100644
> --- a/meta/recipes-devtools/pseudo/pseudo.inc
> +++ b/meta/recipes-devtools/pseudo/pseudo.inc
> @@ -30,9 +30,9 @@ NO32LIBS ??= "1"
> # Compile for the local machine arch...
> do_compile () {
> if [ "${SITEINFO_BITS}" = "64" ]; then
> - ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
> + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite-lib=lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
> else
> - ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
> + ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
> fi
> oe_runmake ${MAKEOPTS}
> }
> @@ -51,7 +51,7 @@ do_compile_prepend_class-native () {
> # built this will fail and be ignored.
> make ${MAKEOPTS} distclean || :
>
> - ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
> + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
> oe_runmake ${MAKEOPTS} libpseudo
> # prevent it from removing the lib, but remove everything else
> make 'LIB=foo' ${MAKEOPTS} distclean
> @@ -63,7 +63,7 @@ do_compile_prepend_class-nativesdk () {
> # We need the 32-bit libpseudo on a 64-bit machine...
> # ... and we really, really, hope that the native host is
> # x86, or else --bits may not work.
> - ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
> + ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
> oe_runmake ${MAKEOPTS} libpseudo
> # prevent it from removing the lib, but remove everything else
> make 'LIB=foo' ${MAKEOPTS} distclean
> diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
> deleted file mode 100644
> index 70fe9c0..0000000
> --- a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require pseudo.inc
> -
> -PR = "r13"
> -
> -SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
> -
> -SRC_URI[md5sum] = "b49bb87c7e1de33f37fea479ddb99dca"
> -SRC_URI[sha256sum] = "ae4bfba2bd1e3954ea8f83bf06571ee4958bf7623e4fa897056281dddfe6446d"
> diff --git a/meta/recipes-devtools/pseudo/pseudo_1.4.3.bb b/meta/recipes-devtools/pseudo/pseudo_1.4.3.bb
> new file mode 100644
> index 0000000..9b3cb5f
> --- /dev/null
> +++ b/meta/recipes-devtools/pseudo/pseudo_1.4.3.bb
> @@ -0,0 +1,8 @@
> +require pseudo.inc
> +
> +PR = "r14"
> +
> +SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
> +
> +SRC_URI[md5sum] = "ac943153aa78e210e2d0db7c85845db3"
> +SRC_URI[sha256sum] = "0ca12a319c0ee87d1c8b2a4310c36a6d68d8d4b8c9c7dba00bace1773baf18e8"
> diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
> index e394ffb..d2fe498 100644
> --- a/meta/recipes-devtools/pseudo/pseudo_git.bb
> +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
> @@ -1,7 +1,7 @@
> require pseudo.inc
>
> -SRCREV = "398a264490713c912b4ce465251a8a82a7905f45"
> -PV = "1.4.1+git${SRCPV}"
> +SRCREV = "a01d7884e5f3acba1460cf6b500d28390e7af9f8"
> +PV = "1.4.3+git${SRCPV}"
> PR = "r28"
>
> DEFAULT_PREFERENCE = "-1"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130201/6263a900/attachment-0002.sig>
More information about the Openembedded-core
mailing list