diff options
Diffstat (limited to 'meta-oe/recipes-support/emacs')
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch | 16 | ||||
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch | 104 | ||||
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs.inc | 147 | ||||
| -rw-r--r-- | meta-oe/recipes-support/emacs/emacs_23.4.bb | 12 |
4 files changed, 0 insertions, 279 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch b/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch deleted file mode 100644 index 4200301a3f..0000000000 --- a/meta-oe/recipes-support/emacs/emacs-23.4/nostdlib-unwind.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix linking problem: -undefined reference to `__aeabi_unwind_cpp_pr0' -undefined reference to `__aeabi_unwind_cpp_pr1' -Index: emacs/src/Makefile.in -=================================================================== ---- emacs.orig/src/Makefile.in 2008-08-16 14:20:18.000000000 +0000 -+++ emacs/src/Makefile.in 2008-08-16 14:51:25.000000000 +0000 -@@ -443,7 +443,7 @@ - ask GCC explicitly where to find libgcc.a. */ - - #ifndef LINKER --#define LINKER $(CC) -nostdlib -+#define LINKER $(CC) -nostdlib -lgcc_s - #endif - - #ifndef LIB_GCC diff --git a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch b/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch deleted file mode 100644 index c15207a437..0000000000 --- a/meta-oe/recipes-support/emacs/emacs-23.4/use-qemu.patch +++ /dev/null @@ -1,104 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -diff -uNr emacs-23.4/Makefile.in emacs-23.4.new/Makefile.in ---- emacs-23.4/Makefile.in 2012-01-11 13:35:01.000000000 +0100 -+++ emacs-23.4.new/Makefile.in 2012-07-31 00:54:07.223590866 +0200 -@@ -336,7 +336,7 @@ - # all preloaded elisp files, and only then dump the actual src/emacs, which - # is not wrong, but is overkill in 99.99% of the cases. - src: Makefile FRC -- boot=bootstrap-emacs$(EXEEXT); \ -+ boot=${QEMU} bootstrap-emacs$(EXEEXT); \ - if [ ! -x "src/$$boot" ]; then \ - cd $@; $(MAKE) all $(MFLAGS) \ - CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ -diff -uNr emacs-23.4/leim/Makefile.in emacs-23.4.new/leim/Makefile.in ---- emacs-23.4/leim/Makefile.in 2012-01-11 13:35:01.000000000 +0100 -+++ emacs-23.4.new/leim/Makefile.in 2012-07-31 00:54:07.179590866 +0200 -@@ -51,7 +51,7 @@ - - # How to run Emacs. - RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ -- ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte -+ ${QEMU} ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte - - # Subdirectories to be made if ${srcdir} is different from the current - # directory. -diff -uNr emacs-23.4/lib-src/Makefile.in emacs-23.4.new/lib-src/Makefile.in ---- emacs-23.4/lib-src/Makefile.in 2012-01-11 13:35:01.000000000 +0100 -+++ emacs-23.4.new/lib-src/Makefile.in 2012-07-31 00:54:07.180590866 +0200 -@@ -23,7 +23,7 @@ - SHELL = /bin/sh - - # Following ../lisp/Makefile.in. --EMACS = ../src/emacs -+EMACS = ${QEMU} ../src/emacs - EMACSOPT = -batch --no-site-file --multibyte - - # ==================== Things `configure' will edit ==================== -@@ -372,7 +372,7 @@ - clobbered too. */ - test-distrib${EXEEXT}: ${srcdir}/test-distrib.c - $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c -- ./test-distrib ${srcdir}/testfile -+ ${QEMU} ./test-distrib ${srcdir}/testfile - - /* We need the following in order to create a <getopt.h> when the system - does not have one that works with the given compiler. */ -diff -uNr emacs-23.4/lisp/Makefile.in emacs-23.4.new/lisp/Makefile.in ---- emacs-23.4/lisp/Makefile.in 2012-01-11 13:35:01.000000000 +0100 -+++ emacs-23.4.new/lisp/Makefile.in 2012-07-31 00:54:07.195590866 +0200 -@@ -26,8 +26,7 @@ - # You can specify a different executable on the make command line, - # e.g. "make EMACS=../src/emacs ...". - --EMACS = ../src/emacs -- -+EMACS = "${QEMU} ../src/emacs" - # Command line flags for Emacs. This must include --multibyte, - # otherwise some files will not compile. - -diff -uNr emacs-23.4/src/Makefile.in emacs-23.4.new/src/Makefile.in ---- emacs-23.4/src/Makefile.in 2012-01-12 11:27:54.000000000 +0100 -+++ emacs-23.4.new/src/Makefile.in 2012-07-31 00:55:30.344593847 +0200 -@@ -482,7 +482,7 @@ - this with the shell''s ``for'' construct. - Note that some people do not have '.' in their paths, so we must - use ./prefix-args. */ --#define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` -+#define YMF_PASS_LDFLAGS(flags) `${QEMU} ./prefix-args -Xlinker flags` - #else - #define YMF_PASS_LDFLAGS(flags) flags - #endif -@@ -919,9 +919,9 @@ - $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR) - - #ifdef HAVE_SHM --RUN_TEMACS = `/bin/pwd`/temacs -nl -+RUN_TEMACS = ${QEMU} temacs -nl - #else --RUN_TEMACS = `/bin/pwd`/temacs -+RUN_TEMACS = ${QEMU} temacs - #endif - - all: emacs${EXEEXT} $(OTHER_FILES) -@@ -936,7 +936,7 @@ - @: This new Emacs is as functional and more efficient then - @: bootstrap-emacs, so let us replace it. - -ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} -- -./emacs -q -batch -f list-load-path-shadows -+ -${QEMU} ./emacs -q -batch -f list-load-path-shadows - #endif /* ! defined (CANNOT_DUMP) */ - - /* We run make-docfile twice because the command line may get too long -@@ -954,8 +954,8 @@ - only in order to reduce the command line length. --Stef */ - ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP} - -rm -f ${etc}DOC -- ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC -- ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} -+ ${QEMU}${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC -+ ${QEMU} ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} - - ${libsrc}make-docfile${EXEEXT}: - cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc deleted file mode 100644 index 5b905f93f9..0000000000 --- a/meta-oe/recipes-support/emacs/emacs.inc +++ /dev/null @@ -1,147 +0,0 @@ -DESCRIPTION = "Emacs" -HOMEPAGE = "http://www.gnu.org/software/emacs/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SECTION = "editor" -# and it needs to run some generated binaries.. -DEPENDS += "qemu-native" - -DEPENDS +=" liblockfile" - -X11DEPENDS = " \ - libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ - jpeg xz pixman libpng librsvg tiff libcroco \ - libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ - libxft libxpm libxrandr libxrender \ - gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ -" - -EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" - - -inherit autotools - -PACKAGES =+ "${PN}-el" - -FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \ - ${datadir}/emacs/*/*/*/*.el.gz" - -FILES_${PN} += "${datadir}/emacs ${datadir}/icons" - -FILES_${PN}-dbg += "${libexecdir}/emacs/*/*/.debug ${datadir}/emacs/*/*/.debug" - -TREEDIR = "${WORKDIR}/qemu-treedir" - -QEMUARCH= "${TARGET_ARCH}" -QEMUARCH_x86 = "i386" - -# Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} " - -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:${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 - ln -sf ../src/emacs leim/emacs -#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass - treedir=${TREEDIR} - if [ -e $treedir ];then - rm -rf $treedir - fi - - mkdir -p $treedir/${base_libdir} - - if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then - cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} - fi - if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then - cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} - 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/${base_libdir}/libc.so ]; then - ln -s libc.so.6 $treedir/${base_libdir}/libc.so - fi - - # copy only as much stuff as we need - # before: 5.5G ../../qemu-treedir/ - # after: 17M ../../qemu-treedir/ - cp -pPR \ - ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ - ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ - - if [ ! -z "${@bb.utils.filter('PACKAGECONFIG', 'x11', d)}" ]; then - echo "X11 build enabled" - # copy only as much stuff as we need - # before: 5.5G ../../qemu-treedir/ - # after: 86M ../../qemu-treedir/ - cp -pPR \ - ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ - ${STAGING_DIR_TARGET}/${base_libdir}/libz.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ - ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* $treedir/${base_libdir}/ - - # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ - - # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ - - # pango pangocairo pangoft2 - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ - - # xcb-render xcb-shm xcb - cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ - fi -} - -do_install_append() { - # freaks package.bbclass and whole bitbake call returns error code - # ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed - mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO - # Info dir listing isn't interesting at this point so remove it if it exists. - if [ -e "${D}${infodir}/dir" ]; then - rm -f ${D}${infodir}/dir - fi -} - -EXTRA_OEMAKE += 'QEMU="${QEMU}"' diff --git a/meta-oe/recipes-support/emacs/emacs_23.4.bb b/meta-oe/recipes-support/emacs/emacs_23.4.bb deleted file mode 100644 index 3388ff01e4..0000000000 --- a/meta-oe/recipes-support/emacs/emacs_23.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require emacs.inc - -PR = "r4" - -PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ - file://use-qemu.patch \ - file://nostdlib-unwind.patch \ -" -SRC_URI[tarball.md5sum] = "34405165fcd978fbc8b304cbd99ccf4f" -SRC_URI[tarball.sha256sum] = "b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18" |