aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/emacs
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-support/emacs
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-contrib-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/emacs')
-rw-r--r--meta-oe/recipes-support/emacs/emacs.inc188
1 files changed, 94 insertions, 94 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index a82371338a..5068596a16 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -9,11 +9,11 @@ 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 \
+ 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} "
@@ -45,100 +45,100 @@ 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"
+ 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
+ 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 "${@base_contains('DISTRO_FEATURES', 'x11', '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}/${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.* \
- ${STAGING_DIR_TARGET}/${libdir}/libz.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
+ 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 "${@base_contains('DISTRO_FEATURES', 'x11', '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}/${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.* \
+ ${STAGING_DIR_TARGET}/${libdir}/libz.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
+ # 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
}
EXTRA_OEMAKE += 'QEMU="${QEMU}"'