diff options
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.4.1.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.4.3.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_git.bb | 6 |
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... |
31 | do_compile () { | 31 | do_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 @@ | |||
1 | require pseudo.inc | ||
2 | |||
3 | PR = "r13" | ||
4 | |||
5 | SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" | ||
6 | |||
7 | SRC_URI[md5sum] = "b49bb87c7e1de33f37fea479ddb99dca" | ||
8 | 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 0000000000..8f25bd061c --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo_1.4.3.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require pseudo.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" | ||
6 | |||
7 | SRC_URI[md5sum] = "ac943153aa78e210e2d0db7c85845db3" | ||
8 | SRC_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 @@ | |||
1 | require pseudo.inc | 1 | require pseudo.inc |
2 | 2 | ||
3 | SRCREV = "398a264490713c912b4ce465251a8a82a7905f45" | 3 | SRCREV = "a01d7884e5f3acba1460cf6b500d28390e7af9f8" |
4 | PV = "1.4.1+git${SRCPV}" | 4 | PV = "1.4.3+git${SRCPV}" |
5 | PR = "r28" | 5 | PR = "r0" |
6 | 6 | ||
7 | DEFAULT_PREFERENCE = "-1" | 7 | DEFAULT_PREFERENCE = "-1" |
8 | 8 | ||