diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-07-21 10:54:53 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-07-22 10:13:04 -0700 |
| commit | dc69812bdf6bdb19d9738079b06e7d2a55d11437 (patch) | |
| tree | f30ed702405aa7c4adef706baebfbd1002ced96b /recipes/emacs | |
| parent | fff85c73672c01afa7d1b27c68cc6b37453ff607 (diff) | |
recipes: Fix references to CROSS_DIR
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Tom Rini <tom_rini@mentor.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Ackef-by: Chris Larson <clarson@kergoth.com>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/emacs')
| -rw-r--r-- | recipes/emacs/emacs.inc | 10 | ||||
| -rw-r--r-- | recipes/emacs/emacs_cvs.bb | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc index 6645f410e6..893ee9d9d8 100644 --- a/recipes/emacs/emacs.inc +++ b/recipes/emacs/emacs.inc @@ -32,7 +32,7 @@ export LOGNAME = "$(whoami)" do_compile_prepend() { sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CROSS_DIR}/${TARGET_SYS}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib" # Ugly hack, see files/use-qemu.patch for more: ln -sf ../src/emacs lisp/emacs ln -sf ../src/emacs lib-src/emacs @@ -44,11 +44,11 @@ do_compile_prepend() { fi mkdir $treedir cp -pPR ${STAGING_DIR_TARGET}/* $treedir - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then - cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then - cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then + cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one diff --git a/recipes/emacs/emacs_cvs.bb b/recipes/emacs/emacs_cvs.bb index c3a98a39e5..a2065be5ce 100644 --- a/recipes/emacs/emacs_cvs.bb +++ b/recipes/emacs/emacs_cvs.bb @@ -27,12 +27,12 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ FILES_${PN} += "${datadir}/emacs" QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}" -LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" +LDFLAGS += "-L${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib" EXTRA_OECONF = "--without-sound --without-x" do_bootstrap() { - cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + cp "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" @@ -46,7 +46,7 @@ do_bootstrap() { addtask bootstrap before do_compile after do_configure do_compile_prepend() { - cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" + cp "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" } |