diff options
Diffstat (limited to 'meta/recipes-devtools/pseudo/pseudo.inc')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index a458dcce69..0416a53d7d 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -1,3 +1,7 @@ | |||
1 | # Note: Due to the bitbake wrapper script, making changes to pseudo can be | ||
2 | # difficult. To work around the current version of the wrapper use: | ||
3 | # BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD] | ||
4 | |||
1 | DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" | 5 | DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" |
2 | HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" | 6 | HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" |
@@ -18,8 +22,12 @@ NO32LIBS ??= "0" | |||
18 | 22 | ||
19 | # Compile for the local machine arch... | 23 | # Compile for the local machine arch... |
20 | do_compile () { | 24 | do_compile () { |
21 | ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} | 25 | if [ "${SITEINFO_BITS}" == "64" ]; then |
22 | oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' | 26 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} |
27 | else | ||
28 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} | ||
29 | fi | ||
30 | oe_runmake | ||
23 | } | 31 | } |
24 | 32 | ||
25 | # Two below are the same | 33 | # Two below are the same |
@@ -28,8 +36,8 @@ do_compile () { | |||
28 | do_compile_prepend_virtclass-native () { | 36 | do_compile_prepend_virtclass-native () { |
29 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 37 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
30 | # We need the 32-bit libpseudo on a 64-bit machine... | 38 | # We need the 32-bit libpseudo on a 64-bit machine... |
31 | ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 | 39 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 |
32 | oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo | 40 | oe_runmake libpseudo |
33 | # prevent it from removing the lib, but remove everything else | 41 | # prevent it from removing the lib, but remove everything else |
34 | make 'LIB=foo' distclean | 42 | make 'LIB=foo' distclean |
35 | fi | 43 | fi |
@@ -38,8 +46,8 @@ do_compile_prepend_virtclass-native () { | |||
38 | do_compile_prepend_virtclass-nativesdk () { | 46 | do_compile_prepend_virtclass-nativesdk () { |
39 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 47 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
40 | # We need the 32-bit libpseudo on a 64-bit machine... | 48 | # We need the 32-bit libpseudo on a 64-bit machine... |
41 | ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 | 49 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 |
42 | oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo | 50 | oe_runmake libpseudo |
43 | # prevent it from removing the lib, but remove everything else | 51 | # prevent it from removing the lib, but remove everything else |
44 | make 'LIB=foo' distclean | 52 | make 'LIB=foo' distclean |
45 | fi | 53 | fi |