diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_1.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_git.bb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 664a9b5937..d5c33dfc19 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -29,9 +29,9 @@ NO32LIBS ??= "0" | |||
29 | # Compile for the local machine arch... | 29 | # Compile for the local machine arch... |
30 | do_compile () { | 30 | do_compile () { |
31 | if [ "${SITEINFO_BITS}" == "64" ]; then | 31 | if [ "${SITEINFO_BITS}" == "64" ]; then |
32 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite | 32 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath |
33 | else | 33 | else |
34 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite | 34 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath |
35 | fi | 35 | fi |
36 | oe_runmake ${MAKEOPTS} | 36 | oe_runmake ${MAKEOPTS} |
37 | } | 37 | } |
@@ -42,7 +42,7 @@ do_compile () { | |||
42 | do_compile_prepend_virtclass-native () { | 42 | do_compile_prepend_virtclass-native () { |
43 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 43 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
44 | # We need the 32-bit libpseudo on a 64-bit machine... | 44 | # We need the 32-bit libpseudo on a 64-bit machine... |
45 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 | 45 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath |
46 | oe_runmake ${MAKEOPTS} libpseudo | 46 | oe_runmake ${MAKEOPTS} libpseudo |
47 | # prevent it from removing the lib, but remove everything else | 47 | # prevent it from removing the lib, but remove everything else |
48 | make 'LIB=foo' ${MAKEOPTS} distclean | 48 | make 'LIB=foo' ${MAKEOPTS} distclean |
@@ -52,7 +52,7 @@ do_compile_prepend_virtclass-native () { | |||
52 | do_compile_prepend_virtclass-nativesdk () { | 52 | do_compile_prepend_virtclass-nativesdk () { |
53 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 53 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
54 | # We need the 32-bit libpseudo on a 64-bit machine... | 54 | # We need the 32-bit libpseudo on a 64-bit machine... |
55 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 | 55 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath |
56 | oe_runmake ${MAKEOPTS} libpseudo | 56 | oe_runmake ${MAKEOPTS} libpseudo |
57 | # prevent it from removing the lib, but remove everything else | 57 | # prevent it from removing the lib, but remove everything else |
58 | make 'LIB=foo' ${MAKEOPTS} distclean | 58 | make 'LIB=foo' ${MAKEOPTS} distclean |
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.3.bb b/meta/recipes-devtools/pseudo/pseudo_1.3.bb index e7a329cea8..080b7390eb 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.3.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.3.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require pseudo.inc | 1 | require pseudo.inc |
2 | 2 | ||
3 | PR = "r7" | 3 | PR = "r8" |
4 | 4 | ||
5 | SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" | 5 | SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2" |
6 | 6 | ||
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 9414c79b78..78572759e8 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb | |||
@@ -2,7 +2,7 @@ require pseudo.inc | |||
2 | 2 | ||
3 | SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c" | 3 | SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c" |
4 | PV = "1.3+git${SRCPV}" | 4 | PV = "1.3+git${SRCPV}" |
5 | PR = "r22" | 5 | PR = "r23" |
6 | 6 | ||
7 | DEFAULT_PREFERENCE = "-1" | 7 | DEFAULT_PREFERENCE = "-1" |
8 | 8 | ||