aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/emacs
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-07-30 13:40:40 -0700
committerKhem Raj <raj.khem@gmail.com>2010-08-03 12:46:05 -0700
commit713508343d70a31ccfe1bdee7fee8038e65b8c40 (patch)
tree37f5d14a294da3f59e4087d75e3fa20db347c45a /recipes/emacs
parent07733978e28ec682fbabac61325fe3dc22d6dbda (diff)
downloadopenembedded-713508343d70a31ccfe1bdee7fee8038e65b8c40.tar.gz
openembedded-713508343d70a31ccfe1bdee7fee8038e65b8c40.tar.bz2
openembedded-713508343d70a31ccfe1bdee7fee8038e65b8c40.zip
recipes: Fix the PATHs for toolchains.
* Look into the new multi-machine friendly installation. Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Koen Kooi <k-kooi@ti.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/emacs')
-rw-r--r--recipes/emacs/emacs.inc10
-rw-r--r--recipes/emacs/emacs_cvs.bb6
2 files changed, 8 insertions, 8 deletions
diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc
index 893ee9d9d8..3db264e543 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:${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${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 ${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
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
fi
- 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
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${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 a2065be5ce..8ffc22f8bc 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${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS += "-L${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
EXTRA_OECONF = "--without-sound --without-x"
do_bootstrap() {
- cp "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ cp "${TOOLCHAIN_PATH}/${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 "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ cp "${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
export QEMU="${QEMU}"
}