diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-devtools/nodejs | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-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-devtools/nodejs')
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 30 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 10 |
2 files changed, 20 insertions, 20 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb index d01a3c405b..89a3232f38 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d6237f3a840aef5b7880fb4e49eecfe5" DEPENDS = "openssl" SRC_URI = " \ - http://nodejs.org/dist/node-v${PV}.tar.gz \ - file://libev-cross-cc_${PV}.patch \ + http://nodejs.org/dist/node-v${PV}.tar.gz \ + file://libev-cross-cc_${PV}.patch \ " SRC_URI[md5sum] = "a6375eaa43db5356bf443e25b828ae16" SRC_URI[sha256sum] = "c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4" @@ -18,29 +18,29 @@ S = "${WORKDIR}/node-v${PV}" CCACHE = "" do_configure () { - sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript - sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript - ./configure --prefix=${prefix} --without-snapshot + sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript + sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript + ./configure --prefix=${prefix} --without-snapshot } do_compile () { - make + make } do_install () { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} - # fix namespace conflicts with other nodejs recipes - mv ${D}${bindir}/node ${D}${bindir}/node4 - mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf + # fix namespace conflicts with other nodejs recipes + mv ${D}${bindir}/node ${D}${bindir}/node4 + mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf - mv ${D}${includedir}/node ${D}${includedir}/node4 + mv ${D}${includedir}/node ${D}${includedir}/node4 - mv ${D}${libdir}/node ${D}${libdir}/node4 - mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc - sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc + mv ${D}${libdir}/node ${D}${libdir}/node4 + mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc + sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc - mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1 + mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1 } FILES_${PN} += "${libdir}/node4/wafadmin" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb index 2db9e6814b..ec9e4cf061 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb @@ -21,18 +21,18 @@ ARCHFLAGS ?= "" # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { - export LD="${CXX}" + export LD="${CXX}" - ./configure --prefix=${prefix} --without-snapshot ${ARCHFLAGS} + ./configure --prefix=${prefix} --without-snapshot ${ARCHFLAGS} } do_compile () { - export LD="${CXX}" - make BUILDTYPE=Release + export LD="${CXX}" + make BUILDTYPE=Release } do_install () { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient " |