diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-19 23:01:09 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-22 16:00:11 +0100 |
| commit | ea3db0183877c760f0b2dbc60fe8d577d0e82b7b (patch) | |
| tree | de0baaf357fa866cc867c8ad1c25ca98a67a8ecb /meta | |
| parent | 6123ee024b19962c12ac636ea1ae3511c30d8fc8 (diff) | |
| download | poky-ea3db0183877c760f0b2dbc60fe8d577d0e82b7b.tar.gz | |
pseudo: Fix bashisms
(From OE-Core rev: 90e22bbb316088fa951d51e75de4e5424bd51ed6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 6ac1301b14..3a37c694f0 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
| @@ -25,7 +25,7 @@ NO32LIBS ??= "1" | |||
| 25 | 25 | ||
| 26 | # Compile for the local machine arch... | 26 | # Compile for the local machine arch... |
| 27 | do_compile () { | 27 | do_compile () { |
| 28 | if [ "${SITEINFO_BITS}" == "64" ]; then | 28 | if [ "${SITEINFO_BITS}" = "64" ]; then |
| 29 | ${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 | 29 | ${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 |
| 30 | else | 30 | else |
| 31 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath | 31 | ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath |
| @@ -37,7 +37,7 @@ do_compile () { | |||
| 37 | # If necessary compile for the alternative machine arch. This is only | 37 | # If necessary compile for the alternative machine arch. This is only |
| 38 | # necessary in a native build. | 38 | # necessary in a native build. |
| 39 | do_compile_prepend_virtclass-native () { | 39 | do_compile_prepend_virtclass-native () { |
| 40 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 40 | if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
| 41 | # We need the 32-bit libpseudo on a 64-bit machine... | 41 | # We need the 32-bit libpseudo on a 64-bit machine... |
| 42 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath | 42 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath |
| 43 | oe_runmake ${MAKEOPTS} libpseudo | 43 | oe_runmake ${MAKEOPTS} libpseudo |
| @@ -47,7 +47,7 @@ do_compile_prepend_virtclass-native () { | |||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | do_compile_prepend_virtclass-nativesdk () { | 49 | do_compile_prepend_virtclass-nativesdk () { |
| 50 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 50 | if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
| 51 | # We need the 32-bit libpseudo on a 64-bit machine... | 51 | # We need the 32-bit libpseudo on a 64-bit machine... |
| 52 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath | 52 | ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath |
| 53 | oe_runmake ${MAKEOPTS} libpseudo | 53 | oe_runmake ${MAKEOPTS} libpseudo |
| @@ -64,14 +64,14 @@ do_install () { | |||
| 64 | # If necessary install for the alternative machine arch. This is only | 64 | # If necessary install for the alternative machine arch. This is only |
| 65 | # necessary in a native build. | 65 | # necessary in a native build. |
| 66 | do_install_append_virtclass-native () { | 66 | do_install_append_virtclass-native () { |
| 67 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 67 | if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
| 68 | mkdir -p ${D}${prefix}/lib/pseudo/lib | 68 | mkdir -p ${D}${prefix}/lib/pseudo/lib |
| 69 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. | 69 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. |
| 70 | fi | 70 | fi |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | do_install_append_virtclass-nativesdk () { | 73 | do_install_append_virtclass-nativesdk () { |
| 74 | if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then | 74 | if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then |
| 75 | mkdir -p ${D}${prefix}/lib/pseudo/lib | 75 | mkdir -p ${D}${prefix}/lib/pseudo/lib |
| 76 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. | 76 | cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. |
| 77 | fi | 77 | fi |
