pseudo: Tell pseudo to avoid specifying an RPATH
[Yocto #2251] Add --without-rpath to avoid embedding rpaths into the pseudo components. (From OE-Core rev: ae978e9671fdbcb31e306308bfb816b4bd2b2496) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fb918fb4db
commit
554cac7d13
|
@ -29,9 +29,9 @@ NO32LIBS ??= "0"
|
|||
# Compile for the local machine arch...
|
||||
do_compile () {
|
||||
if [ "${SITEINFO_BITS}" == "64" ]; then
|
||||
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite
|
||||
${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
|
||||
else
|
||||
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite
|
||||
${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
|
||||
fi
|
||||
oe_runmake ${MAKEOPTS}
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ do_compile () {
|
|||
do_compile_prepend_virtclass-native () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
# We need the 32-bit libpseudo on a 64-bit machine...
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
|
||||
oe_runmake ${MAKEOPTS} libpseudo
|
||||
# prevent it from removing the lib, but remove everything else
|
||||
make 'LIB=foo' ${MAKEOPTS} distclean
|
||||
|
@ -52,7 +52,7 @@ do_compile_prepend_virtclass-native () {
|
|||
do_compile_prepend_virtclass-nativesdk () {
|
||||
if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
|
||||
# We need the 32-bit libpseudo on a 64-bit machine...
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
|
||||
./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
|
||||
oe_runmake ${MAKEOPTS} libpseudo
|
||||
# prevent it from removing the lib, but remove everything else
|
||||
make 'LIB=foo' ${MAKEOPTS} distclean
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require pseudo.inc
|
||||
|
||||
PR = "r7"
|
||||
PR = "r8"
|
||||
|
||||
SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ require pseudo.inc
|
|||
|
||||
SRCREV = "f0375c9aaefbccfd41aebbf6d332bb4d9e8f980c"
|
||||
PV = "1.3+git${SRCPV}"
|
||||
PR = "r22"
|
||||
PR = "r23"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
|
|
Loading…
Reference in New Issue