diff options
Diffstat (limited to 'recipes/emacs/emacs.inc')
| -rw-r--r-- | recipes/emacs/emacs.inc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc index d643d31624..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:${CROSS_DIR}/${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,12 +44,17 @@ 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 ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -pPR ${TOOLCHAIN_PATH}/${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 ${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 + if [ ! -f $treedir/lib/libc.so ]; then + ln -s libc.so.6 $treedir/lib/libc.so + fi } EXTRA_OEMAKE += 'QEMU="${QEMU}"' |