summaryrefslogtreecommitdiffstats
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-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"
9DEPENDS +=" liblockfile" 9DEPENDS +=" liblockfile"
10 10
11X11DEPENDS = " \ 11X11DEPENDS = " \
12 libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \ 12 libice libsm atk cairo dbus expat libffi fontconfig freetype gconf giflib \
13 jpeg xz pixman libpng librsvg tiff libcroco \ 13 jpeg xz pixman libpng librsvg tiff libcroco \
14 libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \ 14 libx11 libxau libxcomposite libxcursor libxdamage libxdmcp libxext libxfixes \
15 libxft libxpm libxrandr libxrender \ 15 libxft libxpm libxrandr libxrender \
16 gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \ 16 gdk-pixbuf glib-2.0 gtk+ pango libxcb harfbuzz icu \
17" 17"
18 18
19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " 19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
@@ -45,100 +45,100 @@ QEMU = "qemu-${QEMUARCH} ${QEMU_OPTIONS} -s 1048576 -L ${TREEDIR} "
45export LOGNAME = "$(whoami)" 45export LOGNAME = "$(whoami)"
46 46
47do_compile_prepend() { 47do_compile_prepend() {
48 sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile` 48 sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
49 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib" 49 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
50# Ugly hack, see files/use-qemu.patch for more: 50# Ugly hack, see files/use-qemu.patch for more:
51 ln -sf ../src/emacs lisp/emacs 51 ln -sf ../src/emacs lisp/emacs
52 ln -sf ../src/emacs lib-src/emacs 52 ln -sf ../src/emacs lib-src/emacs
53 ln -sf ../src/emacs leim/emacs 53 ln -sf ../src/emacs leim/emacs
54#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass 54#copy STAGING_DIR_TARGET and libgcc_s.so* to WORKDIR/qemu-treedir #copied code from glibc-package.bbclass
55 treedir=${TREEDIR} 55 treedir=${TREEDIR}
56 if [ -e $treedir ];then 56 if [ -e $treedir ];then
57 rm -rf $treedir 57 rm -rf $treedir
58 fi 58 fi
59 59
60 mkdir -p $treedir/${base_libdir} 60 mkdir -p $treedir/${base_libdir}
61 61
62 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then 62 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so ]; then
63 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir} 63 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so $treedir/${base_libdir}
64 fi 64 fi
65 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then 65 if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* ]; then
66 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir} 66 cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/${base_libdir}/libgcc_s.so.* $treedir/${base_libdir}
67 fi 67 fi
68 # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails 68 # stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
69 # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one 69 # temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
70 if [ ! -f $treedir/${base_libdir}/libc.so ]; then 70 if [ ! -f $treedir/${base_libdir}/libc.so ]; then
71 ln -s libc.so.6 $treedir/${base_libdir}/libc.so 71 ln -s libc.so.6 $treedir/${base_libdir}/libc.so
72 fi 72 fi
73 73
74 # copy only as much stuff as we need 74 # copy only as much stuff as we need
75 # before: 5.5G ../../qemu-treedir/ 75 # before: 5.5G ../../qemu-treedir/
76 # after: 17M ../../qemu-treedir/ 76 # after: 17M ../../qemu-treedir/
77 cp -pPR \ 77 cp -pPR \
78 ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \ 78 ${STAGING_DIR_TARGET}/${base_libdir}/ld-* \
79 ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \ 79 ${STAGING_DIR_TARGET}/${base_libdir}/libc.* \
80 ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \ 80 ${STAGING_DIR_TARGET}/${base_libdir}/libc-* \
81 ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \ 81 ${STAGING_DIR_TARGET}/${base_libdir}/libm-* \
82 ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \ 82 ${STAGING_DIR_TARGET}/${base_libdir}/libm.* \
83 ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \ 83 ${STAGING_DIR_TARGET}/${base_libdir}/libtinfo.so.* \
84 ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \ 84 ${STAGING_DIR_TARGET}/${base_libdir}/libresolv* \
85 ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \ 85 ${STAGING_DIR_TARGET}/${base_libdir}/libdl* \
86 ${STAGING_DIR_TARGET}/${base_libdir}/librt* \ 86 ${STAGING_DIR_TARGET}/${base_libdir}/librt* \
87 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ 87 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
88 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ 88 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
89 89
90 if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then 90 if [ ! -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ] ; then
91 echo "X11 build enabled" 91 echo "X11 build enabled"
92 # copy only as much stuff as we need 92 # copy only as much stuff as we need
93 # before: 5.5G ../../qemu-treedir/ 93 # before: 5.5G ../../qemu-treedir/
94 # after: 86M ../../qemu-treedir/ 94 # after: 86M ../../qemu-treedir/
95 cp -pPR \ 95 cp -pPR \
96 ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \ 96 ${STAGING_DIR_TARGET}/${base_libdir}/libuuid.so.* \
97 ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \ 97 ${STAGING_DIR_TARGET}/${libdir}/libICE.so.* \
98 ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \ 98 ${STAGING_DIR_TARGET}/${libdir}/libSM.so.* \
99 ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \ 99 ${STAGING_DIR_TARGET}/${libdir}/libatk-1.0.so.* \
100 ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \ 100 ${STAGING_DIR_TARGET}/${libdir}/libcairo.so.* \
101 ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \ 101 ${STAGING_DIR_TARGET}/${libdir}/libdbus-1.so.* \
102 ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \ 102 ${STAGING_DIR_TARGET}/${libdir}/libdbus-glib-1.so.* \
103 ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \ 103 ${STAGING_DIR_TARGET}/${libdir}/libexpat.so.* \
104 ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \ 104 ${STAGING_DIR_TARGET}/${libdir}/libffi.so.* \
105 ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \ 105 ${STAGING_DIR_TARGET}/${libdir}/libfontconfig.so.* \
106 ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \ 106 ${STAGING_DIR_TARGET}/${libdir}/libfreetype.so.* \
107 ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \ 107 ${STAGING_DIR_TARGET}/${libdir}/libgconf-2.so.* \
108 ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \ 108 ${STAGING_DIR_TARGET}/${libdir}/libgif.so.* \
109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \ 109 ${STAGING_DIR_TARGET}/${libdir}/libjpeg.so.* \
110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \ 110 ${STAGING_DIR_TARGET}/${libdir}/liblzma.so.* \
111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \ 111 ${STAGING_DIR_TARGET}/${libdir}/libpixman-1.so.* \
112 ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \ 112 ${STAGING_DIR_TARGET}/${libdir}/libpng1*.so.* \
113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \ 113 ${STAGING_DIR_TARGET}/${libdir}/librsvg-2.so.* \
114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \ 114 ${STAGING_DIR_TARGET}/${libdir}/libstdc++.so.* \
115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \ 115 ${STAGING_DIR_TARGET}/${libdir}/libtiff.so.* \
116 ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \ 116 ${STAGING_DIR_TARGET}/${libdir}/libxml2.so.* \
117 ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \ 117 ${STAGING_DIR_TARGET}/${libdir}/libcroco-0.6.so.* \
118 ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \ 118 ${STAGING_DIR_TARGET}/${libdir}/libharfbuzz.so.* \
119 ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \ 119 ${STAGING_DIR_TARGET}/${libdir}/libicule.so.* \
120 ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \ 120 ${STAGING_DIR_TARGET}/${libdir}/libicuuc.so.* \
121 ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \ 121 ${STAGING_DIR_TARGET}/${libdir}/libicudata.so.* \
122 ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/ 122 ${STAGING_DIR_TARGET}/${libdir}/libz.so.* $treedir/${base_libdir}/
123 123
124 # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender 124 # X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xft Xpm Xrandr Xrender
125 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/ 125 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libX*.so.* $treedir/${base_libdir}/
126 126
127 # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11 127 # gdk-x11 gdk_pixbuf gio glib gmodule gobject gthread gtk-x11
128 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/ 128 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libg*-2.0.so.* $treedir/${base_libdir}/
129 129
130 # pango pangocairo pangoft2 130 # pango pangocairo pangoft2
131 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/ 131 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libpango*-1.0.so.* $treedir/${base_libdir}/
132 132
133 # xcb-render xcb-shm xcb 133 # xcb-render xcb-shm xcb
134 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/ 134 cp -pPR ${STAGING_DIR_TARGET}/${libdir}/libxcb*.so.* $treedir/${base_libdir}/
135 fi 135 fi
136} 136}
137 137
138do_install_append() { 138do_install_append() {
139 # freaks package.bbclass and whole bitbake call returns error code 139 # freaks package.bbclass and whole bitbake call returns error code
140 # 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 140 # 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
141 mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO 141 mv ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.ko ${D}${datadir}/${BPN}/${PV}/etc/tutorials/TUTORIAL.KO
142} 142}
143 143
144EXTRA_OEMAKE += 'QEMU="${QEMU}"' 144EXTRA_OEMAKE += 'QEMU="${QEMU}"'