From a45830a39bb47a9eab27980d52966226c9504ea4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 22:49:41 +0200 Subject: 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 Acked-by: Koen Kooi --- .../recipes-devtools/bootchart/bootchart_git.bb | 2 +- meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 58 ++++++------- .../concurrencykit/concurrencykit_git.bb | 18 ++-- meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 2 +- meta-oe/recipes-devtools/lemon/lemon.inc | 14 ++-- .../libc-client/libc-client_2007e.bb | 12 +-- meta-oe/recipes-devtools/libgee/libgee.inc | 8 +- meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb | 50 +++++------ meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb | 96 +++++++++++----------- meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb | 38 ++++----- meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb | 28 +++---- .../mercurial/mercurial-native_1.9.bb | 6 +- meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb | 30 +++---- meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 10 +-- meta-oe/recipes-devtools/orc/orc.inc | 2 +- .../packagekit/packagekit_0.5.6.bb | 14 ++-- meta-oe/recipes-devtools/php/php.inc | 10 +-- .../recipes-devtools/php/php/phar-makefile.patch | 8 +- meta-oe/recipes-devtools/php/php_5.3.19.bb | 2 +- .../python/python-dateutil_1.4.1.bb | 4 +- .../recipes-devtools/python/python-mako_0.7.2.bb | 2 +- .../python/python-matplotlib_1.1.0.bb | 8 +- .../recipes-devtools/python/python-numpy_1.7.0.bb | 24 +++--- .../recipes-devtools/python/python-pexpect_2.3.bb | 10 +-- .../recipes-devtools/python/python-pyqt_4.9.6.bb | 38 ++++----- .../recipes-devtools/python/python-pyserial_2.4.bb | 6 +- .../python/python-pyudev_0.16.1.bb | 6 +- .../python/python-pyusb_1.0.0a2.bb | 2 +- .../recipes-devtools/python/python-pyyaml_3.10.bb | 6 +- .../python/python-simplejson_2.2.1.bb | 10 +-- .../recipes-devtools/python/python-sip_4.14.2.bb | 16 ++-- .../recipes-devtools/python/python-smbus_3.0.3.bb | 8 +- .../recipes-devtools/python/python-tornado_git.bb | 2 +- .../python/python-twisted_10.2.0.bb | 80 +++++++++--------- meta-oe/recipes-devtools/swig/swig.inc | 56 ++++++------- meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb | 30 +++---- 36 files changed, 358 insertions(+), 358 deletions(-) (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb index f5ef582688..a8b81849f3 100644 --- a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb +++ b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb @@ -11,7 +11,7 @@ PE = "1" SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git \ file://0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch \ file://0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch \ - " +" SRCREV = "872fb107028e377eef3c0c7c8a6e0f7c32b8ebb8" diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb index 9ae25bb650..3300fd234e 100644 --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb +++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb @@ -37,7 +37,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ file://cloud9-avahi.service \ file://cloud9.service \ file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \ - " +" SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed" SRCREV_o3 = "302cd3a6d5039f53a9fa3932bed88b53281c1e1e" @@ -68,46 +68,46 @@ SRCREV_FORMAT = "cloud9ide" S = "${WORKDIR}/git" do_configure () { - cd ${WORKDIR}/o3 - node-waf -vv configure + cd ${WORKDIR}/o3 + node-waf -vv configure } EXTRA_CXXFLAGS = "-Idefault/include -I../include -Idefault/hosts -I../hosts -Idefault/modules -I../modules -Idefault/deps -I../deps -I${STAGING_DIR_NATIVE}/usr/include/node4 -fPIC -DPIC" do_compile () { - cd ${WORKDIR}/o3 - node4 tools/gluegen.js - cd hosts - ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc - ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc - cd .. - ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2 + cd ${WORKDIR}/o3 + node4 tools/gluegen.js + cd hosts + ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc + ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc + cd .. + ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2 } do_install () { - install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9 - rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9 - - touch ${D}${bindir}/cloud9 - echo "#!/bin/sh" > ${D}${bindir}/cloud9 - echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9 - chmod 0755 ${D}${bindir}/cloud9 - - install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml - install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js - install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js - install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node - - install -m 0755 -d ${D}${sysconfdir}/avahi/services/ - install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system + install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9 + rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9 + + touch ${D}${bindir}/cloud9 + echo "#!/bin/sh" > ${D}${bindir}/cloud9 + echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9 + chmod 0755 ${D}${bindir}/cloud9 + + install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml + install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js + install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js + install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node + + install -m 0755 -d ${D}${sysconfdir}/avahi/services/ + install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system } FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \ ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \ - " +" RDEPENDS_${PN} = "nodejs4 nodejs gzip" diff --git a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index b0ff5cf458..7dcbb21e68 100644 --- a/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -11,7 +11,7 @@ SRCREV = "900d203aa9e41288545368ea40da0bee89f7907f" LIC_FILES_CHKSUM = "file://LICENSE;md5=f12611e65e064515ce264249b2bdea98" SRC_URI = "git://git.concurrencykit.org/ck.git;protocol=git \ file://cross.patch \ - " +" S = "${WORKDIR}/git" @@ -23,18 +23,18 @@ PLAT_powerpc64 = "ppc64" PLAT ?= "${HOST_ARCH}" do_configure () { - export PLATFORM=${PLAT} - export COMPILER='gcc' - ${S}/configure \ - --prefix=${prefix} \ - --includedir=${includedir} \ - --libdir=${libdir} \ + export PLATFORM=${PLAT} + export COMPILER='gcc' + ${S}/configure \ + --prefix=${prefix} \ + --includedir=${includedir} \ + --libdir=${libdir} \ } do_compile () { - oe_runmake + oe_runmake } do_install () { - oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' install } diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb index 733b8ed110..9a6a56f859 100644 --- a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb +++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d EXTRA_OECONF += "--disable-scrollkeeper" do_configure_prepend() { - sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am + sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am } FILES_${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-devtools/lemon/lemon.inc b/meta-oe/recipes-devtools/lemon/lemon.inc index 9a8d3abbdc..57b9fb710e 100644 --- a/meta-oe/recipes-devtools/lemon/lemon.inc +++ b/meta-oe/recipes-devtools/lemon/lemon.inc @@ -9,16 +9,16 @@ SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ S = "${WORKDIR}/sqlite-${PV}/tool" do_compile() { - ${CC} ${CFLAGS} lemon.c -c -o lemon.o - ${CCLD} ${LDFLAGS} lemon.o -o lemon + ${CC} ${CFLAGS} lemon.c -c -o lemon.o + ${CCLD} ${LDFLAGS} lemon.o -o lemon } do_install() { - install -d ${D}${bindir} - install -m 0755 lemon ${D}${bindir} - install -m 0644 lempar.c ${D}${bindir} - install -d ${D}${mandir}/man1 - install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/ + install -d ${D}${bindir} + install -m 0755 lemon ${D}${bindir} + install -m 0644 lempar.c ${D}${bindir} + install -d ${D}${mandir}/man1 + install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/ } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb b/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb index 1ecbe68d94..b961e302d3 100644 --- a/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb +++ b/meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb @@ -21,15 +21,15 @@ EXTRA_OEMAKE = "CC='${CC}'" HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h" do_compile() { - echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS - oe_runmake lnp + echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS + oe_runmake lnp } do_install() { - install -d ${D}${includedir}/c-client - install ${HEADERS} ${D}${includedir}/c-client - install -d ${D}${libdir} - install c-client/c-client.a ${D}${libdir}/libc-client.a + install -d ${D}${includedir}/c-client + install ${HEADERS} ${D}${includedir}/c-client + install -d ${D}${libdir} + install c-client/c-client.a ${D}${libdir}/libc-client.a } ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-devtools/libgee/libgee.inc b/meta-oe/recipes-devtools/libgee/libgee.inc index 8542cde5a5..c681285440 100644 --- a/meta-oe/recipes-devtools/libgee/libgee.inc +++ b/meta-oe/recipes-devtools/libgee/libgee.inc @@ -11,8 +11,8 @@ PE = "1" inherit autotools vala do_configure_prepend() { - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f m4/$i - done + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f m4/$i + done } diff --git a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb index 4b8ff985c9..e721e7e6c4 100644 --- a/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb +++ b/meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb @@ -22,42 +22,42 @@ S = "${WORKDIR}/git" LTPROOT = "/opt/ltp" EXTRA_OEMAKE_append = " \ - prefix=${LTPROOT} \ - CROSS_COMPILE=${HOST_PREFIX} \ - SKIP_IDCHECK=1 \ - KERNEL_INC=${STAGING_KERNEL_DIR}/include \ - KERNEL_USR_INC=${STAGING_INCDIR} \ - ALSA_INCPATH=${STAGING_INCDIR} \ - ALSA_LIBPATH=${STAGING_LIBDIR} \ - PLATFORM=${MACHINE} \ + prefix=${LTPROOT} \ + CROSS_COMPILE=${HOST_PREFIX} \ + SKIP_IDCHECK=1 \ + KERNEL_INC=${STAGING_KERNEL_DIR}/include \ + KERNEL_USR_INC=${STAGING_INCDIR} \ + ALSA_INCPATH=${STAGING_INCDIR} \ + ALSA_LIBPATH=${STAGING_LIBDIR} \ + PLATFORM=${MACHINE} \ " TARGET_CC_ARCH += "${LDFLAGS}" FILES_${PN}-dbg += " \ - ${LTPROOT}/.debug \ - ${LTPROOT}/bin/.debug \ - ${LTPROOT}/runtest/.debug \ - ${LTPROOT}/testcases/bin/.debug \ - ${LTPROOT}/testcases/bin/*/bin/.debug \ - ${LTPROOT}/testcases/bin/*/test/.debug \ - ${LTPROOT}/testcases/bin/ddt/.debug \ - ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ - ${LTPROOT}/testcases/bin/ddt/*/test/.debug \ + ${LTPROOT}/.debug \ + ${LTPROOT}/bin/.debug \ + ${LTPROOT}/runtest/.debug \ + ${LTPROOT}/testcases/bin/.debug \ + ${LTPROOT}/testcases/bin/*/bin/.debug \ + ${LTPROOT}/testcases/bin/*/test/.debug \ + ${LTPROOT}/testcases/bin/ddt/.debug \ + ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ + ${LTPROOT}/testcases/bin/ddt/*/test/.debug \ " FILES_${PN} += "${LTPROOT}/*" do_configure() { - cp ${S}/include/config.h.default ${S}/include/config.h - cp ${S}/include/mk/config.mk.default ${S}/include/mk/config.mk - cp ${S}/include/mk/features.mk.default ${S}/include/mk/features.mk - echo "${TAG}" > ${S}/ChangeLog + cp ${S}/include/config.h.default ${S}/include/config.h + cp ${S}/include/mk/config.mk.default ${S}/include/mk/config.mk + cp ${S}/include/mk/features.mk.default ${S}/include/mk/features.mk + echo "${TAG}" > ${S}/ChangeLog } do_install() { - oe_runmake DESTDIR=${D} install - install -d ${D}${datadir} - cp -a ${D}${LTPROOT}/share/* ${D}${datadir} - rm -rf ${D}${LTPROOT}/share/ + oe_runmake DESTDIR=${D} install + install -d ${D}${datadir} + cp -a ${D}${LTPROOT}/share/* ${D}${datadir} + rm -rf ${D}${LTPROOT}/share/ } diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb b/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb index 9fd423fe91..7cefa769b4 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb @@ -11,14 +11,14 @@ PR = "r5" COMPATIBLE_TARGET_SYS = "(?!sh[34])" SRC_URI = "\ - ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.1.diff.gz;name=patch \ - file://add-sysdep.patch \ - file://ltrace-compile.patch \ - file://ltrace-mips-remove-CP.patch \ - file://ltrace-mips.patch \ - file://ltrace-ppc.patch \ - file://ltrace-fix-sysdep_h-dependency.patch \ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.1.diff.gz;name=patch \ + file://add-sysdep.patch \ + file://ltrace-compile.patch \ + file://ltrace-mips-remove-CP.patch \ + file://ltrace-mips.patch \ + file://ltrace-ppc.patch \ + file://ltrace-fix-sysdep_h-dependency.patch \ " inherit autotools @@ -26,53 +26,53 @@ export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}" TARGET_CC_ARCH += "${LDFLAGS}" do_configure_prepend() { - case ${TARGET_ARCH} in - arm*) ln -sf ./linux-gnu sysdeps/linux-gnueabi ;; - mips*) ln -sf ./mipsel sysdeps/linux-gnu/mips ;; - esac - sed -e 's:uname -m:echo @HOST_CPU@:' \ - sysdeps/linux-gnu/Makefile > sysdeps/linux-gnu/Makefile.in + case ${TARGET_ARCH} in + arm*) ln -sf ./linux-gnu sysdeps/linux-gnueabi ;; + mips*) ln -sf ./mipsel sysdeps/linux-gnu/mips ;; + esac + sed -e 's:uname -m:echo @HOST_CPU@:' \ + sysdeps/linux-gnu/Makefile > sysdeps/linux-gnu/Makefile.in } do_compile() { - case ${TARGET_ARCH} in - alpha*) LTRACE_ARCH=alpha ;; - arm*) LTRACE_ARCH=arm ;; - cris*) LTRACE_ARCH=cris ;; - hppa*) LTRACE_ARCH=parisc ;; - i*86*) LTRACE_ARCH=i386 ;; - ia64*) LTRACE_ARCH=ia64 ;; - mips*) LTRACE_ARCH=mips ;; - m68k*) LTRACE_ARCH=m68k ;; - powerpc*) LTRACE_ARCH=ppc ;; - s390*) LTRACE_ARCH=s390 ;; - sh*) LTRACE_ARCH=sh ;; - sparc64*) LTRACE_ARCH=sparc64 ;; - sparc*) LTRACE_ARCH=sparc ;; - x86_64*) LTRACE_ARCH=x86_64 ;; - esac - oe_runmake LDFLAGS="${TARGET_LDFLAGS}" LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake LDFLAGS="${TARGET_LDFLAGS}" LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} } do_install() { - case ${TARGET_ARCH} in - alpha*) LTRACE_ARCH=alpha ;; - arm*) LTRACE_ARCH=arm ;; - cris*) LTRACE_ARCH=cris ;; - hppa*) LTRACE_ARCH=parisc ;; - i*86*) LTRACE_ARCH=i386 ;; - ia64*) LTRACE_ARCH=ia64 ;; - mips*) LTRACE_ARCH=mips ;; - m68k*) LTRACE_ARCH=m68k ;; - powerpc*) LTRACE_ARCH=ppc ;; - s390*) LTRACE_ARCH=s390 ;; - sh*) LTRACE_ARCH=sh ;; - sparc64*) LTRACE_ARCH=sparc64 ;; - sparc*) LTRACE_ARCH=sparc ;; - x86_64*) LTRACE_ARCH=x86_64 ;; - esac - oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} DESTDIR=${D} + case ${TARGET_ARCH} in + alpha*) LTRACE_ARCH=alpha ;; + arm*) LTRACE_ARCH=arm ;; + cris*) LTRACE_ARCH=cris ;; + hppa*) LTRACE_ARCH=parisc ;; + i*86*) LTRACE_ARCH=i386 ;; + ia64*) LTRACE_ARCH=ia64 ;; + mips*) LTRACE_ARCH=mips ;; + m68k*) LTRACE_ARCH=m68k ;; + powerpc*) LTRACE_ARCH=ppc ;; + s390*) LTRACE_ARCH=s390 ;; + sh*) LTRACE_ARCH=sh ;; + sparc64*) LTRACE_ARCH=sparc64 ;; + sparc*) LTRACE_ARCH=sparc ;; + x86_64*) LTRACE_ARCH=x86_64 ;; + esac + oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} DESTDIR=${D} } SRC_URI[archive.md5sum] = "3fa7fe715ab879db08bd06d1d59fd90f" diff --git a/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb b/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb index f303d8711d..19fee01569 100644 --- a/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb +++ b/meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb @@ -10,7 +10,7 @@ DEPENDS += "readline" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ file://bitwise_operators.patch \ file://lua5.1.pc \ - " +" S = "${WORKDIR}/lua-${PV}" inherit pkgconfig binconfig @@ -22,30 +22,30 @@ TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'" do_configure_prepend() { - sed -i -e s:/usr/local:${prefix}:g src/luaconf.h - sed -i -e s:lib/lua/5.1/:${base_libdir}/lua/5.1/:g src/luaconf.h + sed -i -e s:/usr/local:${prefix}:g src/luaconf.h + sed -i -e s:lib/lua/5.1/:${base_libdir}/lua/5.1/:g src/luaconf.h } do_compile () { - oe_runmake linux + oe_runmake linux } do_install () { - oe_runmake \ - 'INSTALL_TOP=${D}${prefix}' \ - 'INSTALL_BIN=${D}${bindir}' \ - 'INSTALL_INC=${D}${includedir}/' \ - 'INSTALL_MAN=${D}${mandir}/man1' \ - 'INSTALL_SHARE=${D}${datadir}/lua' \ - 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_CMOD=${D}${libdir}/lua/5.1' \ - install - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/lua5.1.pc ${D}${libdir}/pkgconfig/lua5.1.pc - rmdir ${D}${libdir}/lua/5.1 - rmdir ${D}${libdir}/lua - rmdir ${D}${datadir}/lua/5.1 - rmdir ${D}${datadir}/lua + oe_runmake \ + 'INSTALL_TOP=${D}${prefix}' \ + 'INSTALL_BIN=${D}${bindir}' \ + 'INSTALL_INC=${D}${includedir}/' \ + 'INSTALL_MAN=${D}${mandir}/man1' \ + 'INSTALL_SHARE=${D}${datadir}/lua' \ + 'INSTALL_LIB=${D}${libdir}' \ + 'INSTALL_CMOD=${D}${libdir}/lua/5.1' \ + install + install -d ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/lua5.1.pc ${D}${libdir}/pkgconfig/lua5.1.pc + rmdir ${D}${libdir}/lua/5.1 + rmdir ${D}${libdir}/lua + rmdir ${D}${datadir}/lua/5.1 + rmdir ${D}${datadir}/lua } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb index a7f96f81f5..38783869ca 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb @@ -7,7 +7,7 @@ DEPENDS += "lua5.1" PR = "r2" SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ file://disable_lj_vm_foldarith_for_spe.patch \ - " +" SRC_URI[md5sum] = "97a2b87cc0490784f54b64cfb3b8f5ad" SRC_URI[sha256sum] = "deaed645c4a093c5fb250c30c9933c9131ee05c94b13262d58f6e0b60b338c15" @@ -16,8 +16,8 @@ S = "${WORKDIR}/LuaJIT-${PV}" inherit pkgconfig binconfig do_configure_prepend() { - sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile - sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile + sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile + sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile } EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' @@ -29,25 +29,25 @@ EXTRA_OEMAKE_append_arm = ' HOST_CC="${BUILD_CC} -m32"' EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' do_compile () { - oe_runmake + oe_runmake } do_install () { - oe_runmake 'DESTDIR=${D}' install - rmdir ${D}${datadir}/lua/5.1 \ - ${D}${datadir}/lua \ - ${D}${libdir}/lua/5.1 \ - ${D}${libdir}/lua + oe_runmake 'DESTDIR=${D}' install + rmdir ${D}${datadir}/lua/5.1 \ + ${D}${datadir}/lua \ + ${D}${libdir}/lua/5.1 \ + ${D}${libdir}/lua } PACKAGES += 'luajit-common' FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ - ${libdir}/libluajit-5.1.so.2.0.0 \ - " + ${libdir}/libluajit-5.1.so.2.0.0 \ +" FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ - ${libdir}/libluajit-5.1.so \ - ${libdir}/pkgconfig/luajit.pc \ - " + ${libdir}/libluajit-5.1.so \ + ${libdir}/pkgconfig/luajit.pc \ +" FILES_luajit-common = "${datadir}/${BPN}-${PV}" diff --git a/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb b/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb index 41b29fbdf8..6a135f68cb 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb @@ -15,13 +15,13 @@ S = "${WORKDIR}/mercurial-${PV}" inherit native EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}" + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}" do_configure_append () { - sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile + sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile } do_install () { - oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} + oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} } 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 " diff --git a/meta-oe/recipes-devtools/orc/orc.inc b/meta-oe/recipes-devtools/orc/orc.inc index 3a9b2f448d..4a356e4a12 100644 --- a/meta-oe/recipes-devtools/orc/orc.inc +++ b/meta-oe/recipes-devtools/orc/orc.inc @@ -21,5 +21,5 @@ python populate_packages_prepend () { } do_compile_prepend_virtclass-native () { - sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c + sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c } diff --git a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb index f7c80638ac..28627c114e 100644 --- a/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb +++ b/meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb @@ -26,20 +26,20 @@ EXTRA_OECONF = "--with-security-framework=dummy \ --disable-local \ --disable-networkmanager \ ac_cv_path_XMLTO=no \ - " +" #do_configure_prepend() { -# mkdir -p m4 -# echo "EXTRA_DIST=" > gtk-doc.make +# mkdir -p m4 +# echo "EXTRA_DIST=" > gtk-doc.make #} do_configure_append() { - for i in $(find . -name Makefile) ; do - sed -i -e s:${STAGING_DIR_NATIVE}::g \ + for i in $(find . -name Makefile) ; do + sed -i -e s:${STAGING_DIR_NATIVE}::g \ -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ - $i - done + $i + done } PACKAGES =+ "${PN}-website" diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 29e82fa716..176d4a1c54 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -30,15 +30,15 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --disable-embedded-mysqli \ --with-mysql="${STAGING_DIR_TARGET}${prefix}" \ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ - --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ + --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ - " +" EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \ --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ ${COMMON_EXTRA_OECONF} \ - " +" LIBS_virtclass-native = " -lxml2 " LIBS_pn-php =" -lpthread " @@ -82,8 +82,8 @@ do_install_append_pn-php() { install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm TMP=`dirname ${D}/${TMPDIR}` while test ${TMP} != ${D}; do - rmdir ${TMP} - TMP=`dirname ${TMP}`; + rmdir ${TMP} + TMP=`dirname ${TMP}`; done } diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch index 6fde251275..9d1dc7b9ae 100644 --- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch @@ -4,8 +4,8 @@ index fc93d1d..9a8cd65 100755 +++ b/ext/phar/Makefile.frag @@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar - PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' - PHP_PHARCMD_EXECUTABLE = ` \ + PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' + PHP_PHARCMD_EXECUTABLE = ` \ - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ - if test "x$(PHP_MODULES)" != "x"; then \ @@ -21,6 +21,6 @@ index fc93d1d..9a8cd65 100755 - fi;` + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` + - PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` - $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc diff --git a/meta-oe/recipes-devtools/php/php_5.3.19.bb b/meta-oe/recipes-devtools/php/php_5.3.19.bb index 8204104b7f..0ce811300b 100644 --- a/meta-oe/recipes-devtools/php/php_5.3.19.bb +++ b/meta-oe/recipes-devtools/php/php_5.3.19.bb @@ -16,7 +16,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ - " +" SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6" diff --git a/meta-oe/recipes-devtools/python/python-dateutil_1.4.1.bb b/meta-oe/recipes-devtools/python/python-dateutil_1.4.1.bb index a449f0339e..2d913e4ee5 100644 --- a/meta-oe/recipes-devtools/python/python-dateutil_1.4.1.bb +++ b/meta-oe/recipes-devtools/python/python-dateutil_1.4.1.bb @@ -15,8 +15,8 @@ PACKAGES =+ "${PN}-zoneinfo" FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo" RDEPENDS_${PN} = "\ - python-core \ - python-datetime \ + python-core \ + python-datetime \ " SRC_URI[md5sum] = "2a5f25ab12fcefcf0b21348f2d47595a" diff --git a/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb b/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb index 6f71561bdd..9e381f3dc2 100644 --- a/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb +++ b/meta-oe/recipes-devtools/python/python-mako_0.7.2.bb @@ -16,4 +16,4 @@ inherit setuptools RDEPENDS_${PN} = "python-threading \ python-netclient \ python-html \ - " +" diff --git a/meta-oe/recipes-devtools/python/python-matplotlib_1.1.0.bb b/meta-oe/recipes-devtools/python/python-matplotlib_1.1.0.bb index 788ba2f7cf..7bb61fd57e 100644 --- a/meta-oe/recipes-devtools/python/python-matplotlib_1.1.0.bb +++ b/meta-oe/recipes-devtools/python/python-matplotlib_1.1.0.bb @@ -10,7 +10,7 @@ RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ file://fix_setup.patch \ file://fix_setupext.patch \ - " +" S = "${WORKDIR}/matplotlib-${PV}" @@ -19,9 +19,9 @@ EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../" inherit distutils do_compile_prepend() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ - true + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true } # need to export these variables for python-config to work diff --git a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb index 23bec15bbd..a3698d30f4 100644 --- a/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb +++ b/meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb @@ -9,18 +9,18 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ CONFIGFILESURI ?= "" CONFIGFILESURI_aarch64 = "file://config.h \ - file://_numpyconfig.h \ - " + file://_numpyconfig.h \ +" CONFIGFILESURI_arm = "file://config.h \ - file://numpyconfig.h \ - " + file://numpyconfig.h \ +" CONFIGFILESURI_mipsel = "file://config.h \ - file://numpyconfig.h \ - " + file://numpyconfig.h \ +" CONFIGFILESURI_i586 = "file://config.h \ file://numpyconfig.h \ - " +" S = "${WORKDIR}/numpy-${PV}" @@ -29,10 +29,10 @@ inherit distutils # Make the build fail and replace *config.h with proper one # This is a ugly, ugly hack - Koen do_compile_prepend() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ - true - cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true + cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" @@ -59,4 +59,4 @@ RDEPENDS_${PN} = "python-unittest \ python-email \ python-subprocess \ python-compression \ - " +" diff --git a/meta-oe/recipes-devtools/python/python-pexpect_2.3.bb b/meta-oe/recipes-devtools/python/python-pexpect_2.3.bb index d1b8530bcf..1c64365dad 100644 --- a/meta-oe/recipes-devtools/python/python-pexpect_2.3.bb +++ b/meta-oe/recipes-devtools/python/python-pexpect_2.3.bb @@ -11,11 +11,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils RDEPENDS_${PN} = "\ - python-core \ - python-io \ - python-terminal \ - python-resource \ - python-fcntl \ + python-core \ + python-io \ + python-terminal \ + python-resource \ + python-fcntl \ " diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb index 340796a7c8..f21464a93e 100644 --- a/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb +++ b/meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb @@ -4,11 +4,11 @@ AUTHOR = "Phil Thomson @ riverbank.co.uk" SECTION = "devel/python" LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION" LIC_FILES_CHKSUM = "\ - file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \ - file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \ - file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \ - file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \ - file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \ + file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \ + file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \ + file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \ + file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \ + file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \ " DEPENDS = "sip-native python-sip" @@ -18,8 +18,8 @@ PYQT_OE_VERSION = "Qt_4_8_3" PR = "r1" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \ - file://pyqt-generated.patch;apply=no \ + ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \ + file://pyqt-generated.patch;apply=no \ " SRC_URI[md5sum] = "514e1f9597771dc732ba75ba9fa5c6b6" SRC_URI[sha256sum] = "a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d" @@ -27,11 +27,11 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}" # arm and mips machines need some extra patches SRC_URI_append_arm = "\ - file://qreal_float_support.diff \ + file://qreal_float_support.diff \ " SRC_URI_append_mipsel = "\ - file://qreal_float_support.diff \ + file://qreal_float_support.diff \ " inherit qt4x11 sip distutils-base @@ -51,16 +51,16 @@ SIP_MODULES = "QtCore QtDeclarative QtGui QtNetwork QtSql QtSvg QtXml QtWebKit" MAKE_MODULES = "qpy ${SIP_MODULES}" EXTRA_QMAKEVARS_POST += "\ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=../qpy/QtCore \ - INCLUDEPATH+=../qpy/QtGui \ - INCLUDEPATH+=../qpy/QtDeclarative \ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \ - INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ + INCLUDEPATH+=../qpy/QtCore \ + INCLUDEPATH+=../qpy/QtGui \ + INCLUDEPATH+=../qpy/QtDeclarative \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \ + INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \ " FIX_QREAL = "\ " diff --git a/meta-oe/recipes-devtools/python/python-pyserial_2.4.bb b/meta-oe/recipes-devtools/python/python-pyserial_2.4.bb index 02ba6b7ba4..0cce5cbc9e 100644 --- a/meta-oe/recipes-devtools/python/python-pyserial_2.4.bb +++ b/meta-oe/recipes-devtools/python/python-pyserial_2.4.bb @@ -13,9 +13,9 @@ inherit setuptools # FIXME might stop packaging serialwin32 and serialjava files RDEPENDS_${PN} = "\ - python-fcntl \ - python-io \ - python-stringold \ + python-fcntl \ + python-io \ + python-stringold \ " SRC_URI[md5sum] = "eec19df59fd75ba5a136992897f8e468" diff --git a/meta-oe/recipes-devtools/python/python-pyudev_0.16.1.bb b/meta-oe/recipes-devtools/python/python-pyudev_0.16.1.bb index ec54b4403e..741d037cc0 100644 --- a/meta-oe/recipes-devtools/python/python-pyudev_0.16.1.bb +++ b/meta-oe/recipes-devtools/python/python-pyudev_0.16.1.bb @@ -19,7 +19,7 @@ do_configure_prepend() { } RDEPENDS_${PN} = "\ - python-ctypes \ - python-subprocess \ - python-misc \ + python-ctypes \ + python-subprocess \ + python-misc \ " diff --git a/meta-oe/recipes-devtools/python/python-pyusb_1.0.0a2.bb b/meta-oe/recipes-devtools/python/python-pyusb_1.0.0a2.bb index 40242829b4..e5956dbdfa 100644 --- a/meta-oe/recipes-devtools/python/python-pyusb_1.0.0a2.bb +++ b/meta-oe/recipes-devtools/python/python-pyusb_1.0.0a2.bb @@ -7,7 +7,7 @@ DEPENDS = "libusb1" PR = "r1" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pyusb/${SRCNAME}-${PV}.tar.gz \ + ${SOURCEFORGE_MIRROR}/pyusb/${SRCNAME}-${PV}.tar.gz \ " SRC_URI[md5sum] = "9136b3dc019272c62a5b6d4eb624f89f" SRC_URI[sha256sum] = "dacbf7d568c0bb09a974d56da66d165351f1ba3c4d5169ab5b734266623e1736" diff --git a/meta-oe/recipes-devtools/python/python-pyyaml_3.10.bb b/meta-oe/recipes-devtools/python/python-pyyaml_3.10.bb index 625efd59bd..100e1c81ac 100644 --- a/meta-oe/recipes-devtools/python/python-pyyaml_3.10.bb +++ b/meta-oe/recipes-devtools/python/python-pyyaml_3.10.bb @@ -7,7 +7,7 @@ DEPENDS = "libyaml python-cython-native" SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz \ file://setup.py \ - " +" SRC_URI[md5sum] = "74c94a383886519e9e7b3dd1ee540247" SRC_URI[sha256sum] = "e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c" @@ -17,6 +17,6 @@ S = "${WORKDIR}/PyYAML-${PV}" inherit distutils do_configure_prepend() { - # upstream setup.py overcomplicated, use ours - install -m 0644 ${WORKDIR}/setup.py ${S} + # upstream setup.py overcomplicated, use ours + install -m 0644 ${WORKDIR}/setup.py ${S} } diff --git a/meta-oe/recipes-devtools/python/python-simplejson_2.2.1.bb b/meta-oe/recipes-devtools/python/python-simplejson_2.2.1.bb index 6be59c9276..85d69c1a73 100644 --- a/meta-oe/recipes-devtools/python/python-simplejson_2.2.1.bb +++ b/meta-oe/recipes-devtools/python/python-simplejson_2.2.1.bb @@ -17,11 +17,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils RDEPENDS_${PN} = "\ - python-core \ - python-re \ - python-io \ - python-netserver \ - python-numbers \ + python-core \ + python-re \ + python-io \ + python-netserver \ + python-numbers \ " diff --git a/meta-oe/recipes-devtools/python/python-sip_4.14.2.bb b/meta-oe/recipes-devtools/python/python-sip_4.14.2.bb index 1159a2abb4..747d896321 100644 --- a/meta-oe/recipes-devtools/python/python-sip_4.14.2.bb +++ b/meta-oe/recipes-devtools/python/python-sip_4.14.2.bb @@ -29,17 +29,17 @@ EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ do_configure_prepend() { - cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro - cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c - cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h + cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro + cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c + cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h } do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so - # sipconfig.py sipdistutils.py - install -d ${D}${includedir} - install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so + # sipconfig.py sipdistutils.py + install -d ${D}${includedir} + install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h } FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" diff --git a/meta-oe/recipes-devtools/python/python-smbus_3.0.3.bb b/meta-oe/recipes-devtools/python/python-smbus_3.0.3.bb index 5ba24c6efc..3085d2f3c4 100644 --- a/meta-oe/recipes-devtools/python/python-smbus_3.0.3.bb +++ b/meta-oe/recipes-devtools/python/python-smbus_3.0.3.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \ - " +" SRC_URI[md5sum] = "511376eed04455cdb277ef19c5f73bb4" SRC_URI[sha256sum] = "23b28e474741834e3f1b35b0686528769a13adc92d2ff5603cbda1d6bd5e5629" @@ -14,7 +14,7 @@ inherit distutils S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" do_configure_prepend() { - # Adjust for OE header rename - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk - sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c + # Adjust for OE header rename + sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk + sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c } diff --git a/meta-oe/recipes-devtools/python/python-tornado_git.bb b/meta-oe/recipes-devtools/python/python-tornado_git.bb index f158923ffb..9c58e94bcb 100644 --- a/meta-oe/recipes-devtools/python/python-tornado_git.bb +++ b/meta-oe/recipes-devtools/python/python-tornado_git.bb @@ -7,7 +7,7 @@ PV = "2.2.1+git${SRCPV}" SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505" SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \ file://0001-disable-AI_ADDRCONFIG-flag.patch \ - " +" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb b/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb index 532094675b..d585bfab47 100644 --- a/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb +++ b/meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb @@ -23,68 +23,68 @@ do_install_append() { } PACKAGES += "\ - ${PN}-zsh \ - ${PN}-test \ - ${PN}-protocols \ - ${PN}-bin \ - ${PN}-conch \ - ${PN}-lore \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-flow \ - ${PN}-pair \ - ${PN}-core \ + ${PN}-zsh \ + ${PN}-test \ + ${PN}-protocols \ + ${PN}-bin \ + ${PN}-conch \ + ${PN}-lore \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-news \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ + ${PN}-flow \ + ${PN}-pair \ + ${PN}-core \ " RDEPENDS_${PN} = "python-core python-zopeinterface" RDEPENDS_${PN} += "\ - ${PN}-bin \ - ${PN}-conch \ - ${PN}-lore \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ + ${PN}-bin \ + ${PN}-conch \ + ${PN}-lore \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-news \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ " ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-test = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ " FILES_${PN}-protocols = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ " FILES_${PN}-zsh = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ " FILES_${PN}-bin = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \ " FILES_${PN}-conch = " \ - ${bindir}/ckeygen \ - ${bindir}/tkconch \ - ${bindir}/conch \ - ${bindir}/conchftp \ - ${bindir}/cftp \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ + ${bindir}/ckeygen \ + ${bindir}/tkconch \ + ${bindir}/conch \ + ${bindir}/conchftp \ + ${bindir}/cftp \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ " FILES_${PN}-core = " \ diff --git a/meta-oe/recipes-devtools/swig/swig.inc b/meta-oe/recipes-devtools/swig/swig.inc index df6f780706..0476d53a73 100644 --- a/meta-oe/recipes-devtools/swig/swig.inc +++ b/meta-oe/recipes-devtools/swig/swig.inc @@ -15,38 +15,38 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" inherit autotools pythonnative EXTRA_OECONF = " \ - --with-python=${PYTHON} \ - --without-allegrocl \ - --without-android \ - --without-boost \ - --without-chicken \ - --without-clisp \ - --without-csharp \ - --without-d \ - --without-gcj \ - --without-go \ - --without-guile \ - --without-java \ - --without-lua \ - --without-mzscheme \ - --without-ocaml \ - --without-octave \ - --without-perl5 \ - --without-pike \ - --without-php \ - --without-python3 \ - --without-r \ - --without-ruby \ - --without-tcl \ + --with-python=${PYTHON} \ + --without-allegrocl \ + --without-android \ + --without-boost \ + --without-chicken \ + --without-clisp \ + --without-csharp \ + --without-d \ + --without-gcj \ + --without-go \ + --without-guile \ + --without-java \ + --without-lua \ + --without-mzscheme \ + --without-ocaml \ + --without-octave \ + --without-perl5 \ + --without-pike \ + --without-php \ + --without-python3 \ + --without-r \ + --without-ruby \ + --without-tcl \ " BBCLASSEXTEND = "native" do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf } diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb index 247e55b69a..d44b407ef3 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=24954e7e6b54c1b4e16de861b9d392fc" DEPENDS = "tcl virtual/libx11 libxt" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ - file://confsearch.diff;striplevel=2 \ - file://manpages.diff;striplevel=2 \ - file://non-linux.diff;striplevel=2 \ - file://rpath.diff;striplevel=2 \ - file://tklibrary.diff;striplevel=2 \ - file://tkprivate.diff;striplevel=2 \ - file://fix-xft.diff \ + ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ + file://confsearch.diff;striplevel=2 \ + file://manpages.diff;striplevel=2 \ + file://non-linux.diff;striplevel=2 \ + file://rpath.diff;striplevel=2 \ + file://tklibrary.diff;striplevel=2 \ + file://tkprivate.diff;striplevel=2 \ + file://fix-xft.diff \ " SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6" SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4" @@ -23,16 +23,16 @@ S = "${WORKDIR}/tk${PV}/unix" inherit autotools EXTRA_OECONF = "\ - --enable-threads \ - --with-tcl=${STAGING_BINDIR_CROSS} \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ + --enable-threads \ + --with-tcl=${STAGING_BINDIR_CROSS} \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ " do_install_append() { - mv libtk8.5.so libtk8.5.so.0 - oe_libinstall -so libtk8.5 ${D}${libdir} - ln -sf wish8.5 ${D}${bindir}/wish + mv libtk8.5.so libtk8.5.so.0 + oe_libinstall -so libtk8.5 ${D}${libdir} + ln -sf wish8.5 ${D}${bindir}/wish } PACKAGES =+ "${PN}-lib" -- cgit 1.2.3-korg