summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2013-02-05 14:21:42 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-08 14:50:36 +0000
commit7ee057911f8ce80b2026b93bd232629378b08db5 (patch)
tree752a2628d7b1b84ecf372a675060668eaf906c6e
parentdab46628222333de8987bc760a846b0ab637cd2b (diff)
downloadpoky-7ee057911f8ce80b2026b93bd232629378b08db5.tar.gz
pseudo.inc: Fix sqlite libdir again, pseudo 1.4.3
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. (This ends up being ${baselib}; on targets, that might not be lib, but for native builds it generally is, and for SDK builds it appears to do the right thing.) Testing: Successful build of meta-toolchain for both 64-bit and 32-bit SDKMACHINE, and builds with NO32LIBS = "0" also succeeded. Also builds for multilib targets. (From OE-Core rev: ae8811bb26fba2e71d7280f6d6c4f5cec6a2871b) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc8
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.4.1.bb8
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.4.3.bb8
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb6
4 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 98f706c36a..9748d5493d 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -30,9 +30,9 @@ NO32LIBS ??= "1"
30# Compile for the local machine arch... 30# Compile for the local machine arch...
31do_compile () { 31do_compile () {
32 if [ "${SITEINFO_BITS}" = "64" ]; then 32 if [ "${SITEINFO_BITS}" = "64" ]; then
33 ${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 33 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
34 else 34 else
35 ${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 35 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
36 fi 36 fi
37 oe_runmake ${MAKEOPTS} 37 oe_runmake ${MAKEOPTS}
38} 38}
@@ -51,7 +51,7 @@ do_compile_prepend_class-native () {
51 # built this will fail and be ignored. 51 # built this will fail and be ignored.
52 make ${MAKEOPTS} distclean || : 52 make ${MAKEOPTS} distclean || :
53 53
54 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath 54 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
55 oe_runmake ${MAKEOPTS} libpseudo 55 oe_runmake ${MAKEOPTS} libpseudo
56 # prevent it from removing the lib, but remove everything else 56 # prevent it from removing the lib, but remove everything else
57 make 'LIB=foo' ${MAKEOPTS} distclean 57 make 'LIB=foo' ${MAKEOPTS} distclean
@@ -63,7 +63,7 @@ do_compile_prepend_class-nativesdk () {
63 # We need the 32-bit libpseudo on a 64-bit machine... 63 # We need the 32-bit libpseudo on a 64-bit machine...
64 # ... and we really, really, hope that the native host is 64 # ... and we really, really, hope that the native host is
65 # x86, or else --bits may not work. 65 # x86, or else --bits may not work.
66 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath 66 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
67 oe_runmake ${MAKEOPTS} libpseudo 67 oe_runmake ${MAKEOPTS} libpseudo
68 # prevent it from removing the lib, but remove everything else 68 # prevent it from removing the lib, but remove everything else
69 make 'LIB=foo' ${MAKEOPTS} distclean 69 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 70fe9c0f1b..0000000000
--- a/meta/recipes-devtools/pseudo/pseudo_1.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require pseudo.inc
2
3PR = "r13"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
6
7SRC_URI[md5sum] = "b49bb87c7e1de33f37fea479ddb99dca"
8SRC_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 0000000000..8f25bd061c
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.4.3.bb
@@ -0,0 +1,8 @@
1require pseudo.inc
2
3PR = "r0"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
6
7SRC_URI[md5sum] = "ac943153aa78e210e2d0db7c85845db3"
8SRC_URI[sha256sum] = "0ca12a319c0ee87d1c8b2a4310c36a6d68d8d4b8c9c7dba00bace1773baf18e8"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index e394ffb2ec..bbdba432ec 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,8 +1,8 @@
1require pseudo.inc 1require pseudo.inc
2 2
3SRCREV = "398a264490713c912b4ce465251a8a82a7905f45" 3SRCREV = "a01d7884e5f3acba1460cf6b500d28390e7af9f8"
4PV = "1.4.1+git${SRCPV}" 4PV = "1.4.3+git${SRCPV}"
5PR = "r28" 5PR = "r0"
6 6
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
8 8