summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r--meta-oe/recipes-devtools/bootchart/bootchart_git.bb2
-rw-r--r--meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb58
-rw-r--r--meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb18
-rw-r--r--meta-oe/recipes-devtools/glade/glade3_3.8.2.bb2
-rw-r--r--meta-oe/recipes-devtools/lemon/lemon.inc14
-rw-r--r--meta-oe/recipes-devtools/libc-client/libc-client_2007e.bb12
-rw-r--r--meta-oe/recipes-devtools/libgee/libgee.inc8
-rw-r--r--meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb50
-rw-r--r--meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb96
-rw-r--r--meta-oe/recipes-devtools/lua/lua5.1_5.1.5.bb38
-rw-r--r--meta-oe/recipes-devtools/luajit/luajit_2.0.0.bb28
-rw-r--r--meta-oe/recipes-devtools/mercurial/mercurial-native_1.9.bb6
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs4_0.4.12.bb30
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb10
-rw-r--r--meta-oe/recipes-devtools/orc/orc.inc2
-rw-r--r--meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb14
-rw-r--r--meta-oe/recipes-devtools/php/php.inc10
-rw-r--r--meta-oe/recipes-devtools/php/php/phar-makefile.patch8
-rw-r--r--meta-oe/recipes-devtools/php/php_5.3.19.bb2
-rw-r--r--meta-oe/recipes-devtools/python/python-dateutil_1.4.1.bb4
-rw-r--r--meta-oe/recipes-devtools/python/python-mako_0.7.2.bb2
-rw-r--r--meta-oe/recipes-devtools/python/python-matplotlib_1.1.0.bb8
-rw-r--r--meta-oe/recipes-devtools/python/python-numpy_1.7.0.bb24
-rw-r--r--meta-oe/recipes-devtools/python/python-pexpect_2.3.bb10
-rw-r--r--meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb38
-rw-r--r--meta-oe/recipes-devtools/python/python-pyserial_2.4.bb6
-rw-r--r--meta-oe/recipes-devtools/python/python-pyudev_0.16.1.bb6
-rw-r--r--meta-oe/recipes-devtools/python/python-pyusb_1.0.0a2.bb2
-rw-r--r--meta-oe/recipes-devtools/python/python-pyyaml_3.10.bb6
-rw-r--r--meta-oe/recipes-devtools/python/python-simplejson_2.2.1.bb10
-rw-r--r--meta-oe/recipes-devtools/python/python-sip_4.14.2.bb16
-rw-r--r--meta-oe/recipes-devtools/python/python-smbus_3.0.3.bb8
-rw-r--r--meta-oe/recipes-devtools/python/python-tornado_git.bb2
-rw-r--r--meta-oe/recipes-devtools/python/python-twisted_10.2.0.bb80
-rw-r--r--meta-oe/recipes-devtools/swig/swig.inc56
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk_8.5.8.bb30
36 files changed, 358 insertions, 358 deletions
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"
11SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git \ 11SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git \
12 file://0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch \ 12 file://0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch \
13 file://0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch \ 13 file://0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch \
14 " 14"
15 15
16SRCREV = "872fb107028e377eef3c0c7c8a6e0f7c32b8ebb8" 16SRCREV = "872fb107028e377eef3c0c7c8a6e0f7c32b8ebb8"
17 17
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 \
37 file://cloud9-avahi.service \ 37 file://cloud9-avahi.service \
38 file://cloud9.service \ 38 file://cloud9.service \
39 file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \ 39 file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
40 " 40"
41 41
42SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed" 42SRCREV_cloud9ide = "c4e2574896a22bb749f0500b25f41c888d346bed"
43SRCREV_o3 = "302cd3a6d5039f53a9fa3932bed88b53281c1e1e" 43SRCREV_o3 = "302cd3a6d5039f53a9fa3932bed88b53281c1e1e"
@@ -68,46 +68,46 @@ SRCREV_FORMAT = "cloud9ide"
68S = "${WORKDIR}/git" 68S = "${WORKDIR}/git"
69 69
70do_configure () { 70do_configure () {
71 cd ${WORKDIR}/o3 71 cd ${WORKDIR}/o3
72 node-waf -vv configure 72 node-waf -vv configure
73} 73}
74 74
75EXTRA_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" 75EXTRA_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"
76 76
77do_compile () { 77do_compile () {
78 cd ${WORKDIR}/o3 78 cd ${WORKDIR}/o3
79 node4 tools/gluegen.js 79 node4 tools/gluegen.js
80 cd hosts 80 cd hosts
81 ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc 81 ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node.o node-o3/sh_node.cc
82 ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc 82 ${CXX} ${TARGET_CXXFLAGS} ${EXTRA_CXXFLAGS} -c -o sh_node_libs.o node-o3/sh_node_libs.cc
83 cd .. 83 cd ..
84 ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2 84 ${CXX} ${TARGET_LDFLAGS} hosts/sh_node.o hosts/sh_node_libs.o -o o3.node -shared -Wl,-Bdynamic -lxml2
85} 85}
86 86
87do_install () { 87do_install () {
88 install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9 88 install -m 0755 -d ${D}${datadir}/cloud9 ${D}${bindir} ${D}/var/lib/cloud9
89 rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9 89 rsync -r --exclude=".*" ${S}/* ${D}${datadir}/cloud9
90 90
91 touch ${D}${bindir}/cloud9 91 touch ${D}${bindir}/cloud9
92 echo "#!/bin/sh" > ${D}${bindir}/cloud9 92 echo "#!/bin/sh" > ${D}${bindir}/cloud9
93 echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9 93 echo "node4 ${datadir}/cloud9/bin/cloud9.js -l 0.0.0.0 -w /var/lib/cloud9 -p 3000" >> ${D}${bindir}/cloud9
94 chmod 0755 ${D}${bindir}/cloud9 94 chmod 0755 ${D}${bindir}/cloud9
95 95
96 install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml 96 install -m 0755 -d ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml
97 install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js 97 install -m 0644 ${WORKDIR}/index.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/index.js
98 install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js 98 install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js
99 install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node 99 install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node
100 100
101 install -m 0755 -d ${D}${sysconfdir}/avahi/services/ 101 install -m 0755 -d ${D}${sysconfdir}/avahi/services/
102 install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ 102 install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
103 103
104 install -d ${D}${systemd_unitdir}/system 104 install -d ${D}${systemd_unitdir}/system
105 install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system 105 install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
106} 106}
107 107
108FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \ 108FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
109 ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \ 109 ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \
110 " 110"
111 111
112RDEPENDS_${PN} = "nodejs4 nodejs gzip" 112RDEPENDS_${PN} = "nodejs4 nodejs gzip"
113 113
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"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=f12611e65e064515ce264249b2bdea98" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=f12611e65e064515ce264249b2bdea98"
12SRC_URI = "git://git.concurrencykit.org/ck.git;protocol=git \ 12SRC_URI = "git://git.concurrencykit.org/ck.git;protocol=git \
13 file://cross.patch \ 13 file://cross.patch \
14 " 14"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
@@ -23,18 +23,18 @@ PLAT_powerpc64 = "ppc64"
23PLAT ?= "${HOST_ARCH}" 23PLAT ?= "${HOST_ARCH}"
24 24
25do_configure () { 25do_configure () {
26 export PLATFORM=${PLAT} 26 export PLATFORM=${PLAT}
27 export COMPILER='gcc' 27 export COMPILER='gcc'
28 ${S}/configure \ 28 ${S}/configure \
29 --prefix=${prefix} \ 29 --prefix=${prefix} \
30 --includedir=${includedir} \ 30 --includedir=${includedir} \
31 --libdir=${libdir} \ 31 --libdir=${libdir} \
32} 32}
33 33
34do_compile () { 34do_compile () {
35 oe_runmake 35 oe_runmake
36} 36}
37 37
38do_install () { 38do_install () {
39 oe_runmake 'DESTDIR=${D}' install 39 oe_runmake 'DESTDIR=${D}' install
40} 40}
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
17EXTRA_OECONF += "--disable-scrollkeeper" 17EXTRA_OECONF += "--disable-scrollkeeper"
18 18
19do_configure_prepend() { 19do_configure_prepend() {
20 sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am 20 sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
21} 21}
22 22
23FILES_${PN} += "${datadir}/icons" 23FILES_${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 \
9S = "${WORKDIR}/sqlite-${PV}/tool" 9S = "${WORKDIR}/sqlite-${PV}/tool"
10 10
11do_compile() { 11do_compile() {
12 ${CC} ${CFLAGS} lemon.c -c -o lemon.o 12 ${CC} ${CFLAGS} lemon.c -c -o lemon.o
13 ${CCLD} ${LDFLAGS} lemon.o -o lemon 13 ${CCLD} ${LDFLAGS} lemon.o -o lemon
14} 14}
15 15
16do_install() { 16do_install() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 install -m 0755 lemon ${D}${bindir} 18 install -m 0755 lemon ${D}${bindir}
19 install -m 0644 lempar.c ${D}${bindir} 19 install -m 0644 lempar.c ${D}${bindir}
20 install -d ${D}${mandir}/man1 20 install -d ${D}${mandir}/man1
21 install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/ 21 install -m 0644 ${WORKDIR}/lemon.1 ${D}${mandir}/man1/
22} 22}
23 23
24BBCLASSEXTEND = "native" 24BBCLASSEXTEND = "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}'"
21HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h" 21HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
22 22
23do_compile() { 23do_compile() {
24 echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS 24 echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS
25 oe_runmake lnp 25 oe_runmake lnp
26} 26}
27 27
28do_install() { 28do_install() {
29 install -d ${D}${includedir}/c-client 29 install -d ${D}${includedir}/c-client
30 install ${HEADERS} ${D}${includedir}/c-client 30 install ${HEADERS} ${D}${includedir}/c-client
31 install -d ${D}${libdir} 31 install -d ${D}${libdir}
32 install c-client/c-client.a ${D}${libdir}/libc-client.a 32 install c-client/c-client.a ${D}${libdir}/libc-client.a
33} 33}
34 34
35ALLOW_EMPTY_${PN} = "1" 35ALLOW_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"
11 11
12inherit autotools vala 12inherit autotools vala
13do_configure_prepend() { 13do_configure_prepend() {
14 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" 14 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
15 for i in ${MACROS}; do 15 for i in ${MACROS}; do
16 rm -f m4/$i 16 rm -f m4/$i
17 done 17 done
18} 18}
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"
22LTPROOT = "/opt/ltp" 22LTPROOT = "/opt/ltp"
23 23
24EXTRA_OEMAKE_append = " \ 24EXTRA_OEMAKE_append = " \
25 prefix=${LTPROOT} \ 25 prefix=${LTPROOT} \
26 CROSS_COMPILE=${HOST_PREFIX} \ 26 CROSS_COMPILE=${HOST_PREFIX} \
27 SKIP_IDCHECK=1 \ 27 SKIP_IDCHECK=1 \
28 KERNEL_INC=${STAGING_KERNEL_DIR}/include \ 28 KERNEL_INC=${STAGING_KERNEL_DIR}/include \
29 KERNEL_USR_INC=${STAGING_INCDIR} \ 29 KERNEL_USR_INC=${STAGING_INCDIR} \
30 ALSA_INCPATH=${STAGING_INCDIR} \ 30 ALSA_INCPATH=${STAGING_INCDIR} \
31 ALSA_LIBPATH=${STAGING_LIBDIR} \ 31 ALSA_LIBPATH=${STAGING_LIBDIR} \
32 PLATFORM=${MACHINE} \ 32 PLATFORM=${MACHINE} \
33" 33"
34 34
35TARGET_CC_ARCH += "${LDFLAGS}" 35TARGET_CC_ARCH += "${LDFLAGS}"
36 36
37FILES_${PN}-dbg += " \ 37FILES_${PN}-dbg += " \
38 ${LTPROOT}/.debug \ 38 ${LTPROOT}/.debug \
39 ${LTPROOT}/bin/.debug \ 39 ${LTPROOT}/bin/.debug \
40 ${LTPROOT}/runtest/.debug \ 40 ${LTPROOT}/runtest/.debug \
41 ${LTPROOT}/testcases/bin/.debug \ 41 ${LTPROOT}/testcases/bin/.debug \
42 ${LTPROOT}/testcases/bin/*/bin/.debug \ 42 ${LTPROOT}/testcases/bin/*/bin/.debug \
43 ${LTPROOT}/testcases/bin/*/test/.debug \ 43 ${LTPROOT}/testcases/bin/*/test/.debug \
44 ${LTPROOT}/testcases/bin/ddt/.debug \ 44 ${LTPROOT}/testcases/bin/ddt/.debug \
45 ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \ 45 ${LTPROOT}/testcases/bin/ddt/*/bin/.debug \
46 ${LTPROOT}/testcases/bin/ddt/*/test/.debug \ 46 ${LTPROOT}/testcases/bin/ddt/*/test/.debug \
47" 47"
48 48
49FILES_${PN} += "${LTPROOT}/*" 49FILES_${PN} += "${LTPROOT}/*"
50 50
51do_configure() { 51do_configure() {
52 cp ${S}/include/config.h.default ${S}/include/config.h 52 cp ${S}/include/config.h.default ${S}/include/config.h
53 cp ${S}/include/mk/config.mk.default ${S}/include/mk/config.mk 53 cp ${S}/include/mk/config.mk.default ${S}/include/mk/config.mk
54 cp ${S}/include/mk/features.mk.default ${S}/include/mk/features.mk 54 cp ${S}/include/mk/features.mk.default ${S}/include/mk/features.mk
55 echo "${TAG}" > ${S}/ChangeLog 55 echo "${TAG}" > ${S}/ChangeLog
56} 56}
57 57
58do_install() { 58do_install() {
59 oe_runmake DESTDIR=${D} install 59 oe_runmake DESTDIR=${D} install
60 install -d ${D}${datadir} 60 install -d ${D}${datadir}
61 cp -a ${D}${LTPROOT}/share/* ${D}${datadir} 61 cp -a ${D}${LTPROOT}/share/* ${D}${datadir}
62 rm -rf ${D}${LTPROOT}/share/ 62 rm -rf ${D}${LTPROOT}/share/
63} 63}
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"
11COMPATIBLE_TARGET_SYS = "(?!sh[34])" 11COMPATIBLE_TARGET_SYS = "(?!sh[34])"
12 12
13SRC_URI = "\ 13SRC_URI = "\
14 ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \ 14 ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz;name=archive \
15 ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.1.diff.gz;name=patch \ 15 ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.1.diff.gz;name=patch \
16 file://add-sysdep.patch \ 16 file://add-sysdep.patch \
17 file://ltrace-compile.patch \ 17 file://ltrace-compile.patch \
18 file://ltrace-mips-remove-CP.patch \ 18 file://ltrace-mips-remove-CP.patch \
19 file://ltrace-mips.patch \ 19 file://ltrace-mips.patch \
20 file://ltrace-ppc.patch \ 20 file://ltrace-ppc.patch \
21 file://ltrace-fix-sysdep_h-dependency.patch \ 21 file://ltrace-fix-sysdep_h-dependency.patch \
22" 22"
23inherit autotools 23inherit autotools
24 24
@@ -26,53 +26,53 @@ export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}"
26TARGET_CC_ARCH += "${LDFLAGS}" 26TARGET_CC_ARCH += "${LDFLAGS}"
27 27
28do_configure_prepend() { 28do_configure_prepend() {
29 case ${TARGET_ARCH} in 29 case ${TARGET_ARCH} in
30 arm*) ln -sf ./linux-gnu sysdeps/linux-gnueabi ;; 30 arm*) ln -sf ./linux-gnu sysdeps/linux-gnueabi ;;
31 mips*) ln -sf ./mipsel sysdeps/linux-gnu/mips ;; 31 mips*) ln -sf ./mipsel sysdeps/linux-gnu/mips ;;
32 esac 32 esac
33 sed -e 's:uname -m:echo @HOST_CPU@:' \ 33 sed -e 's:uname -m:echo @HOST_CPU@:' \
34 sysdeps/linux-gnu/Makefile > sysdeps/linux-gnu/Makefile.in 34 sysdeps/linux-gnu/Makefile > sysdeps/linux-gnu/Makefile.in
35 35
36} 36}
37 37
38do_compile() { 38do_compile() {
39 case ${TARGET_ARCH} in 39 case ${TARGET_ARCH} in
40 alpha*) LTRACE_ARCH=alpha ;; 40 alpha*) LTRACE_ARCH=alpha ;;
41 arm*) LTRACE_ARCH=arm ;; 41 arm*) LTRACE_ARCH=arm ;;
42 cris*) LTRACE_ARCH=cris ;; 42 cris*) LTRACE_ARCH=cris ;;
43 hppa*) LTRACE_ARCH=parisc ;; 43 hppa*) LTRACE_ARCH=parisc ;;
44 i*86*) LTRACE_ARCH=i386 ;; 44 i*86*) LTRACE_ARCH=i386 ;;
45 ia64*) LTRACE_ARCH=ia64 ;; 45 ia64*) LTRACE_ARCH=ia64 ;;
46 mips*) LTRACE_ARCH=mips ;; 46 mips*) LTRACE_ARCH=mips ;;
47 m68k*) LTRACE_ARCH=m68k ;; 47 m68k*) LTRACE_ARCH=m68k ;;
48 powerpc*) LTRACE_ARCH=ppc ;; 48 powerpc*) LTRACE_ARCH=ppc ;;
49 s390*) LTRACE_ARCH=s390 ;; 49 s390*) LTRACE_ARCH=s390 ;;
50 sh*) LTRACE_ARCH=sh ;; 50 sh*) LTRACE_ARCH=sh ;;
51 sparc64*) LTRACE_ARCH=sparc64 ;; 51 sparc64*) LTRACE_ARCH=sparc64 ;;
52 sparc*) LTRACE_ARCH=sparc ;; 52 sparc*) LTRACE_ARCH=sparc ;;
53 x86_64*) LTRACE_ARCH=x86_64 ;; 53 x86_64*) LTRACE_ARCH=x86_64 ;;
54 esac 54 esac
55 oe_runmake LDFLAGS="${TARGET_LDFLAGS}" LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} 55 oe_runmake LDFLAGS="${TARGET_LDFLAGS}" LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH}
56} 56}
57 57
58do_install() { 58do_install() {
59 case ${TARGET_ARCH} in 59 case ${TARGET_ARCH} in
60 alpha*) LTRACE_ARCH=alpha ;; 60 alpha*) LTRACE_ARCH=alpha ;;
61 arm*) LTRACE_ARCH=arm ;; 61 arm*) LTRACE_ARCH=arm ;;
62 cris*) LTRACE_ARCH=cris ;; 62 cris*) LTRACE_ARCH=cris ;;
63 hppa*) LTRACE_ARCH=parisc ;; 63 hppa*) LTRACE_ARCH=parisc ;;
64 i*86*) LTRACE_ARCH=i386 ;; 64 i*86*) LTRACE_ARCH=i386 ;;
65 ia64*) LTRACE_ARCH=ia64 ;; 65 ia64*) LTRACE_ARCH=ia64 ;;
66 mips*) LTRACE_ARCH=mips ;; 66 mips*) LTRACE_ARCH=mips ;;
67 m68k*) LTRACE_ARCH=m68k ;; 67 m68k*) LTRACE_ARCH=m68k ;;
68 powerpc*) LTRACE_ARCH=ppc ;; 68 powerpc*) LTRACE_ARCH=ppc ;;
69 s390*) LTRACE_ARCH=s390 ;; 69 s390*) LTRACE_ARCH=s390 ;;
70 sh*) LTRACE_ARCH=sh ;; 70 sh*) LTRACE_ARCH=sh ;;
71 sparc64*) LTRACE_ARCH=sparc64 ;; 71 sparc64*) LTRACE_ARCH=sparc64 ;;
72 sparc*) LTRACE_ARCH=sparc ;; 72 sparc*) LTRACE_ARCH=sparc ;;
73 x86_64*) LTRACE_ARCH=x86_64 ;; 73 x86_64*) LTRACE_ARCH=x86_64 ;;
74 esac 74 esac
75 oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} DESTDIR=${D} 75 oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} DESTDIR=${D}
76} 76}
77 77
78SRC_URI[archive.md5sum] = "3fa7fe715ab879db08bd06d1d59fd90f" 78SRC_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"
10SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \ 10SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz \
11 file://bitwise_operators.patch \ 11 file://bitwise_operators.patch \
12 file://lua5.1.pc \ 12 file://lua5.1.pc \
13 " 13"
14S = "${WORKDIR}/lua-${PV}" 14S = "${WORKDIR}/lua-${PV}"
15 15
16inherit pkgconfig binconfig 16inherit pkgconfig binconfig
@@ -22,30 +22,30 @@ TARGET_CC_ARCH += " -fPIC ${LDFLAGS}"
22EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'" 22EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -DLUA_USE_LINUX -fPIC' MYLDFLAGS='${LDFLAGS}'"
23 23
24do_configure_prepend() { 24do_configure_prepend() {
25 sed -i -e s:/usr/local:${prefix}:g src/luaconf.h 25 sed -i -e s:/usr/local:${prefix}:g src/luaconf.h
26 sed -i -e s:lib/lua/5.1/:${base_libdir}/lua/5.1/:g src/luaconf.h 26 sed -i -e s:lib/lua/5.1/:${base_libdir}/lua/5.1/:g src/luaconf.h
27} 27}
28 28
29do_compile () { 29do_compile () {
30 oe_runmake linux 30 oe_runmake linux
31} 31}
32 32
33do_install () { 33do_install () {
34 oe_runmake \ 34 oe_runmake \
35 'INSTALL_TOP=${D}${prefix}' \ 35 'INSTALL_TOP=${D}${prefix}' \
36 'INSTALL_BIN=${D}${bindir}' \ 36 'INSTALL_BIN=${D}${bindir}' \
37 'INSTALL_INC=${D}${includedir}/' \ 37 'INSTALL_INC=${D}${includedir}/' \
38 'INSTALL_MAN=${D}${mandir}/man1' \ 38 'INSTALL_MAN=${D}${mandir}/man1' \
39 'INSTALL_SHARE=${D}${datadir}/lua' \ 39 'INSTALL_SHARE=${D}${datadir}/lua' \
40 'INSTALL_LIB=${D}${libdir}' \ 40 'INSTALL_LIB=${D}${libdir}' \
41 'INSTALL_CMOD=${D}${libdir}/lua/5.1' \ 41 'INSTALL_CMOD=${D}${libdir}/lua/5.1' \
42 install 42 install
43 install -d ${D}${libdir}/pkgconfig 43 install -d ${D}${libdir}/pkgconfig
44 install -m 0644 ${WORKDIR}/lua5.1.pc ${D}${libdir}/pkgconfig/lua5.1.pc 44 install -m 0644 ${WORKDIR}/lua5.1.pc ${D}${libdir}/pkgconfig/lua5.1.pc
45 rmdir ${D}${libdir}/lua/5.1 45 rmdir ${D}${libdir}/lua/5.1
46 rmdir ${D}${libdir}/lua 46 rmdir ${D}${libdir}/lua
47 rmdir ${D}${datadir}/lua/5.1 47 rmdir ${D}${datadir}/lua/5.1
48 rmdir ${D}${datadir}/lua 48 rmdir ${D}${datadir}/lua
49} 49}
50BBCLASSEXTEND = "native" 50BBCLASSEXTEND = "native"
51 51
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"
7PR = "r2" 7PR = "r2"
8SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \ 8SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \
9 file://disable_lj_vm_foldarith_for_spe.patch \ 9 file://disable_lj_vm_foldarith_for_spe.patch \
10 " 10"
11SRC_URI[md5sum] = "97a2b87cc0490784f54b64cfb3b8f5ad" 11SRC_URI[md5sum] = "97a2b87cc0490784f54b64cfb3b8f5ad"
12SRC_URI[sha256sum] = "deaed645c4a093c5fb250c30c9933c9131ee05c94b13262d58f6e0b60b338c15" 12SRC_URI[sha256sum] = "deaed645c4a093c5fb250c30c9933c9131ee05c94b13262d58f6e0b60b338c15"
13 13
@@ -16,8 +16,8 @@ S = "${WORKDIR}/LuaJIT-${PV}"
16inherit pkgconfig binconfig 16inherit pkgconfig binconfig
17 17
18do_configure_prepend() { 18do_configure_prepend() {
19 sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile 19 sed -i -e s:/usr/local:${prefix}:g ${S}/Makefile
20 sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile 20 sed -i -e s:/lib$:${base_libdir}:g ${S}/Makefile
21} 21}
22 22
23EXTRA_OEMAKE = 'CROSS=${HOST_PREFIX} TARGET_CFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}"' 23EXTRA_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"'
29EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"' 29EXTRA_OEMAKE_append_mips64 = ' HOST_CC="${BUILD_CC} -m32"'
30 30
31do_compile () { 31do_compile () {
32 oe_runmake 32 oe_runmake
33} 33}
34 34
35do_install () { 35do_install () {
36 oe_runmake 'DESTDIR=${D}' install 36 oe_runmake 'DESTDIR=${D}' install
37 rmdir ${D}${datadir}/lua/5.1 \ 37 rmdir ${D}${datadir}/lua/5.1 \
38 ${D}${datadir}/lua \ 38 ${D}${datadir}/lua \
39 ${D}${libdir}/lua/5.1 \ 39 ${D}${libdir}/lua/5.1 \
40 ${D}${libdir}/lua 40 ${D}${libdir}/lua
41} 41}
42 42
43PACKAGES += 'luajit-common' 43PACKAGES += 'luajit-common'
44 44
45FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \ 45FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \
46 ${libdir}/libluajit-5.1.so.2.0.0 \ 46 ${libdir}/libluajit-5.1.so.2.0.0 \
47 " 47"
48FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ 48FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
49 ${libdir}/libluajit-5.1.so \ 49 ${libdir}/libluajit-5.1.so \
50 ${libdir}/pkgconfig/luajit.pc \ 50 ${libdir}/pkgconfig/luajit.pc \
51 " 51"
52FILES_luajit-common = "${datadir}/${BPN}-${PV}" 52FILES_luajit-common = "${datadir}/${BPN}-${PV}"
53 53
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}"
15inherit native 15inherit native
16 16
17EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ 17EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
18 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}" 18 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} PREFIX=${prefix}"
19 19
20do_configure_append () { 20do_configure_append () {
21 sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile 21 sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile
22} 22}
23 23
24do_install () { 24do_install () {
25 oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} 25 oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix}
26} 26}
27 27
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"
6DEPENDS = "openssl" 6DEPENDS = "openssl"
7 7
8SRC_URI = " \ 8SRC_URI = " \
9 http://nodejs.org/dist/node-v${PV}.tar.gz \ 9 http://nodejs.org/dist/node-v${PV}.tar.gz \
10 file://libev-cross-cc_${PV}.patch \ 10 file://libev-cross-cc_${PV}.patch \
11" 11"
12SRC_URI[md5sum] = "a6375eaa43db5356bf443e25b828ae16" 12SRC_URI[md5sum] = "a6375eaa43db5356bf443e25b828ae16"
13SRC_URI[sha256sum] = "c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4" 13SRC_URI[sha256sum] = "c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4"
@@ -18,29 +18,29 @@ S = "${WORKDIR}/node-v${PV}"
18CCACHE = "" 18CCACHE = ""
19 19
20do_configure () { 20do_configure () {
21 sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript 21 sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript
22 sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript 22 sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript
23 ./configure --prefix=${prefix} --without-snapshot 23 ./configure --prefix=${prefix} --without-snapshot
24} 24}
25 25
26do_compile () { 26do_compile () {
27 make 27 make
28} 28}
29 29
30do_install () { 30do_install () {
31 oe_runmake install DESTDIR=${D} 31 oe_runmake install DESTDIR=${D}
32 32
33 # fix namespace conflicts with other nodejs recipes 33 # fix namespace conflicts with other nodejs recipes
34 mv ${D}${bindir}/node ${D}${bindir}/node4 34 mv ${D}${bindir}/node ${D}${bindir}/node4
35 mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf 35 mv ${D}${bindir}/node-waf ${D}${bindir}/node4-waf
36 36
37 mv ${D}${includedir}/node ${D}${includedir}/node4 37 mv ${D}${includedir}/node ${D}${includedir}/node4
38 38
39 mv ${D}${libdir}/node ${D}${libdir}/node4 39 mv ${D}${libdir}/node ${D}${libdir}/node4
40 mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc 40 mv ${D}${libdir}/pkgconfig/nodejs.pc ${D}${libdir}/pkgconfig/nodejs4.pc
41 sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc 41 sed -i -e s:include/node:include/node4: ${D}${libdir}/pkgconfig/nodejs4.pc
42 42
43 mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1 43 mv ${D}${datadir}/man/man1/node.1 ${D}${datadir}/man/man1/node4.1
44} 44}
45 45
46FILES_${PN} += "${libdir}/node4/wafadmin" 46FILES_${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 ?= ""
21 21
22# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi 22# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
23do_configure () { 23do_configure () {
24 export LD="${CXX}" 24 export LD="${CXX}"
25 25
26 ./configure --prefix=${prefix} --without-snapshot ${ARCHFLAGS} 26 ./configure --prefix=${prefix} --without-snapshot ${ARCHFLAGS}
27} 27}
28 28
29do_compile () { 29do_compile () {
30 export LD="${CXX}" 30 export LD="${CXX}"
31 make BUILDTYPE=Release 31 make BUILDTYPE=Release
32} 32}
33 33
34do_install () { 34do_install () {
35 oe_runmake install DESTDIR=${D} 35 oe_runmake install DESTDIR=${D}
36} 36}
37 37
38RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient " 38RDEPENDS_${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 () {
21} 21}
22 22
23do_compile_prepend_virtclass-native () { 23do_compile_prepend_virtclass-native () {
24 sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c 24 sed -i -e 's#/tmp#.#g' ${S}/orc/orccodemem.c
25} 25}
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 \
26 --disable-local \ 26 --disable-local \
27 --disable-networkmanager \ 27 --disable-networkmanager \
28 ac_cv_path_XMLTO=no \ 28 ac_cv_path_XMLTO=no \
29 " 29"
30 30
31#do_configure_prepend() { 31#do_configure_prepend() {
32# mkdir -p m4 32# mkdir -p m4
33# echo "EXTRA_DIST=" > gtk-doc.make 33# echo "EXTRA_DIST=" > gtk-doc.make
34#} 34#}
35 35
36do_configure_append() { 36do_configure_append() {
37 for i in $(find . -name Makefile) ; do 37 for i in $(find . -name Makefile) ; do
38 sed -i -e s:${STAGING_DIR_NATIVE}::g \ 38 sed -i -e s:${STAGING_DIR_NATIVE}::g \
39 -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \ 39 -e s:${bindir}/mkdir:${STAGING_BINDIR_NATIVE}/mkdir:g \
40 -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \ 40 -e s:/usr/bin/intltool-merge:${STAGING_BINDIR_NATIVE}/intltool-merge:g \
41 $i 41 $i
42 done 42 done
43} 43}
44 44
45PACKAGES =+ "${PN}-website" 45PACKAGES =+ "${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 \
30 --disable-embedded-mysqli \ 30 --disable-embedded-mysqli \
31 --with-mysql="${STAGING_DIR_TARGET}${prefix}" \ 31 --with-mysql="${STAGING_DIR_TARGET}${prefix}" \
32 --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ 32 --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
33 --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ 33 --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \
34 --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ 34 --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
35 --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ 35 --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \
36 " 36"
37EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ 37EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \
38 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \ 38 --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
39 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ 39 --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
40 ${COMMON_EXTRA_OECONF} \ 40 ${COMMON_EXTRA_OECONF} \
41 " 41"
42 42
43LIBS_virtclass-native = " -lxml2 " 43LIBS_virtclass-native = " -lxml2 "
44LIBS_pn-php =" -lpthread " 44LIBS_pn-php =" -lpthread "
@@ -82,8 +82,8 @@ do_install_append_pn-php() {
82 install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm 82 install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
83 TMP=`dirname ${D}/${TMPDIR}` 83 TMP=`dirname ${D}/${TMPDIR}`
84 while test ${TMP} != ${D}; do 84 while test ${TMP} != ${D}; do
85 rmdir ${TMP} 85 rmdir ${TMP}
86 TMP=`dirname ${TMP}`; 86 TMP=`dirname ${TMP}`;
87 done 87 done
88} 88}
89 89
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
4+++ b/ext/phar/Makefile.frag 4+++ b/ext/phar/Makefile.frag
5@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar 5@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
6 6
7 PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' 7 PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
8 PHP_PHARCMD_EXECUTABLE = ` \ 8 PHP_PHARCMD_EXECUTABLE = ` \
9- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ 9- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
10- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ 10- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
11- if test "x$(PHP_MODULES)" != "x"; then \ 11- if test "x$(PHP_MODULES)" != "x"; then \
@@ -21,6 +21,6 @@ index fc93d1d..9a8cd65 100755
21- fi;` 21- fi;`
22+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` 22+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
23+ 23+
24 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 24 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
25 25
26 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc 26 $(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 \
16 file://fix-fpm-cross-compile.patch \ 16 file://fix-fpm-cross-compile.patch \
17 file://php-fpm.conf \ 17 file://php-fpm.conf \
18 file://php-fpm-apache.conf \ 18 file://php-fpm-apache.conf \
19 " 19"
20 20
21SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" 21SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
22SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6" 22SRC_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"
15FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo" 15FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 python-core \ 18 python-core \
19 python-datetime \ 19 python-datetime \
20" 20"
21 21
22SRC_URI[md5sum] = "2a5f25ab12fcefcf0b21348f2d47595a" 22SRC_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
16RDEPENDS_${PN} = "python-threading \ 16RDEPENDS_${PN} = "python-threading \
17 python-netclient \ 17 python-netclient \
18 python-html \ 18 python-html \
19 " 19"
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"
10SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \
11 file://fix_setup.patch \ 11 file://fix_setup.patch \
12 file://fix_setupext.patch \ 12 file://fix_setupext.patch \
13 " 13"
14 14
15S = "${WORKDIR}/matplotlib-${PV}" 15S = "${WORKDIR}/matplotlib-${PV}"
16 16
@@ -19,9 +19,9 @@ EXTRA_OECONF = "--disable-docs --with-python-includes=${STAGING_INCDIR}/../"
19inherit distutils 19inherit distutils
20 20
21do_compile_prepend() { 21do_compile_prepend() {
22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
23 ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ 23 ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
24 true 24 true
25} 25}
26 26
27# need to export these variables for python-config to work 27# 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 \
9CONFIGFILESURI ?= "" 9CONFIGFILESURI ?= ""
10 10
11CONFIGFILESURI_aarch64 = "file://config.h \ 11CONFIGFILESURI_aarch64 = "file://config.h \
12 file://_numpyconfig.h \ 12 file://_numpyconfig.h \
13 " 13"
14CONFIGFILESURI_arm = "file://config.h \ 14CONFIGFILESURI_arm = "file://config.h \
15 file://numpyconfig.h \ 15 file://numpyconfig.h \
16 " 16"
17CONFIGFILESURI_mipsel = "file://config.h \ 17CONFIGFILESURI_mipsel = "file://config.h \
18 file://numpyconfig.h \ 18 file://numpyconfig.h \
19 " 19"
20 20
21CONFIGFILESURI_i586 = "file://config.h \ 21CONFIGFILESURI_i586 = "file://config.h \
22 file://numpyconfig.h \ 22 file://numpyconfig.h \
23 " 23"
24 24
25S = "${WORKDIR}/numpy-${PV}" 25S = "${WORKDIR}/numpy-${PV}"
26 26
@@ -29,10 +29,10 @@ inherit distutils
29# Make the build fail and replace *config.h with proper one 29# Make the build fail and replace *config.h with proper one
30# This is a ugly, ugly hack - Koen 30# This is a ugly, ugly hack - Koen
31do_compile_prepend() { 31do_compile_prepend() {
32 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 32 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
33 ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ 33 ${STAGING_BINDIR_NATIVE}/python-native/python setup.py build ${DISTUTILS_BUILD_ARGS} || \
34 true 34 true
35 cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ 35 cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/
36} 36}
37 37
38FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" 38FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
@@ -59,4 +59,4 @@ RDEPENDS_${PN} = "python-unittest \
59 python-email \ 59 python-email \
60 python-subprocess \ 60 python-subprocess \
61 python-compression \ 61 python-compression \
62 " 62"
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}"
11inherit distutils 11inherit distutils
12 12
13RDEPENDS_${PN} = "\ 13RDEPENDS_${PN} = "\
14 python-core \ 14 python-core \
15 python-io \ 15 python-io \
16 python-terminal \ 16 python-terminal \
17 python-resource \ 17 python-resource \
18 python-fcntl \ 18 python-fcntl \
19" 19"
20 20
21 21
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"
4SECTION = "devel/python" 4SECTION = "devel/python"
5LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION" 5LICENSE = "GPLv2 & GPLv3 & GPL_EXCEPTION"
6LIC_FILES_CHKSUM = "\ 6LIC_FILES_CHKSUM = "\
7 file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \ 7 file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \
8 file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \ 8 file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \
9 file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \ 9 file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \
10 file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \ 10 file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \
11 file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \ 11 file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \
12" 12"
13 13
14DEPENDS = "sip-native python-sip" 14DEPENDS = "sip-native python-sip"
@@ -18,8 +18,8 @@ PYQT_OE_VERSION = "Qt_4_8_3"
18PR = "r1" 18PR = "r1"
19 19
20SRC_URI = "\ 20SRC_URI = "\
21 ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \ 21 ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
22 file://pyqt-generated.patch;apply=no \ 22 file://pyqt-generated.patch;apply=no \
23" 23"
24SRC_URI[md5sum] = "514e1f9597771dc732ba75ba9fa5c6b6" 24SRC_URI[md5sum] = "514e1f9597771dc732ba75ba9fa5c6b6"
25SRC_URI[sha256sum] = "a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d" 25SRC_URI[sha256sum] = "a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d"
@@ -27,11 +27,11 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
27 27
28# arm and mips machines need some extra patches 28# arm and mips machines need some extra patches
29SRC_URI_append_arm = "\ 29SRC_URI_append_arm = "\
30 file://qreal_float_support.diff \ 30 file://qreal_float_support.diff \
31" 31"
32 32
33SRC_URI_append_mipsel = "\ 33SRC_URI_append_mipsel = "\
34 file://qreal_float_support.diff \ 34 file://qreal_float_support.diff \
35" 35"
36 36
37inherit qt4x11 sip distutils-base 37inherit qt4x11 sip distutils-base
@@ -51,16 +51,16 @@ SIP_MODULES = "QtCore QtDeclarative QtGui QtNetwork QtSql QtSvg QtXml QtWebKit"
51MAKE_MODULES = "qpy ${SIP_MODULES}" 51MAKE_MODULES = "qpy ${SIP_MODULES}"
52 52
53EXTRA_QMAKEVARS_POST += "\ 53EXTRA_QMAKEVARS_POST += "\
54 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ 54 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
55 INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ 55 INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
56 INCLUDEPATH+=../qpy/QtCore \ 56 INCLUDEPATH+=../qpy/QtCore \
57 INCLUDEPATH+=../qpy/QtGui \ 57 INCLUDEPATH+=../qpy/QtGui \
58 INCLUDEPATH+=../qpy/QtDeclarative \ 58 INCLUDEPATH+=../qpy/QtDeclarative \
59 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \ 59 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtCore \
60 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \ 60 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtGui \
61 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \ 61 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtDeclarative \
62 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \ 62 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtWebKit \
63 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \ 63 INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/QtNetwork \
64" 64"
65FIX_QREAL = "\ 65FIX_QREAL = "\
66" 66"
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
13# FIXME might stop packaging serialwin32 and serialjava files 13# FIXME might stop packaging serialwin32 and serialjava files
14 14
15RDEPENDS_${PN} = "\ 15RDEPENDS_${PN} = "\
16 python-fcntl \ 16 python-fcntl \
17 python-io \ 17 python-io \
18 python-stringold \ 18 python-stringold \
19" 19"
20 20
21SRC_URI[md5sum] = "eec19df59fd75ba5a136992897f8e468" 21SRC_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() {
19} 19}
20 20
21RDEPENDS_${PN} = "\ 21RDEPENDS_${PN} = "\
22 python-ctypes \ 22 python-ctypes \
23 python-subprocess \ 23 python-subprocess \
24 python-misc \ 24 python-misc \
25" 25"
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"
7PR = "r1" 7PR = "r1"
8 8
9SRC_URI = "\ 9SRC_URI = "\
10 ${SOURCEFORGE_MIRROR}/pyusb/${SRCNAME}-${PV}.tar.gz \ 10 ${SOURCEFORGE_MIRROR}/pyusb/${SRCNAME}-${PV}.tar.gz \
11" 11"
12SRC_URI[md5sum] = "9136b3dc019272c62a5b6d4eb624f89f" 12SRC_URI[md5sum] = "9136b3dc019272c62a5b6d4eb624f89f"
13SRC_URI[sha256sum] = "dacbf7d568c0bb09a974d56da66d165351f1ba3c4d5169ab5b734266623e1736" 13SRC_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"
7 7
8SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz \ 8SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz \
9 file://setup.py \ 9 file://setup.py \
10 " 10"
11 11
12SRC_URI[md5sum] = "74c94a383886519e9e7b3dd1ee540247" 12SRC_URI[md5sum] = "74c94a383886519e9e7b3dd1ee540247"
13SRC_URI[sha256sum] = "e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c" 13SRC_URI[sha256sum] = "e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c"
@@ -17,6 +17,6 @@ S = "${WORKDIR}/PyYAML-${PV}"
17inherit distutils 17inherit distutils
18 18
19do_configure_prepend() { 19do_configure_prepend() {
20 # upstream setup.py overcomplicated, use ours 20 # upstream setup.py overcomplicated, use ours
21 install -m 0644 ${WORKDIR}/setup.py ${S} 21 install -m 0644 ${WORKDIR}/setup.py ${S}
22} 22}
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}"
17inherit distutils 17inherit distutils
18 18
19RDEPENDS_${PN} = "\ 19RDEPENDS_${PN} = "\
20 python-core \ 20 python-core \
21 python-re \ 21 python-re \
22 python-io \ 22 python-io \
23 python-netserver \ 23 python-netserver \
24 python-numbers \ 24 python-numbers \
25" 25"
26 26
27 27
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 \
29 29
30 30
31do_configure_prepend() { 31do_configure_prepend() {
32 cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro 32 cat siplib.sbf.in | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.pro
33 cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c 33 cat siplib.c.in | sed s,@CFG_MODULE_BASENAME@,sip, > siplib.c
34 cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h 34 cat sip.h.in | sed -e s,@CFG_MODULE_NAME@,sip,g > sip.h
35} 35}
36 36
37do_install() { 37do_install() {
38 install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ 38 install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
39 install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so 39 install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
40 # sipconfig.py sipdistutils.py 40 # sipconfig.py sipdistutils.py
41 install -d ${D}${includedir} 41 install -d ${D}${includedir}
42 install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h 42 install -m 0644 ../siplib/sip.h ${D}${includedir}/sip.h
43} 43}
44 44
45FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" 45FILES_${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"
3LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" 3LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8"
4 4
5SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \ 5SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \
6 " 6"
7SRC_URI[md5sum] = "511376eed04455cdb277ef19c5f73bb4" 7SRC_URI[md5sum] = "511376eed04455cdb277ef19c5f73bb4"
8SRC_URI[sha256sum] = "23b28e474741834e3f1b35b0686528769a13adc92d2ff5603cbda1d6bd5e5629" 8SRC_URI[sha256sum] = "23b28e474741834e3f1b35b0686528769a13adc92d2ff5603cbda1d6bd5e5629"
9 9
@@ -14,7 +14,7 @@ inherit distutils
14S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" 14S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
15 15
16do_configure_prepend() { 16do_configure_prepend() {
17 # Adjust for OE header rename 17 # Adjust for OE header rename
18 sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk 18 sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
19 sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c 19 sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
20} 20}
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}"
7SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505" 7SRCREV = "c501917eba46dec30b1f2ef12497dffc4beec505"
8SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \ 8SRC_URI = "git://github.com/facebook/tornado.git;branch=branch2.2 \
9 file://0001-disable-AI_ADDRCONFIG-flag.patch \ 9 file://0001-disable-AI_ADDRCONFIG-flag.patch \
10 " 10"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
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() {
23} 23}
24 24
25PACKAGES += "\ 25PACKAGES += "\
26 ${PN}-zsh \ 26 ${PN}-zsh \
27 ${PN}-test \ 27 ${PN}-test \
28 ${PN}-protocols \ 28 ${PN}-protocols \
29 ${PN}-bin \ 29 ${PN}-bin \
30 ${PN}-conch \ 30 ${PN}-conch \
31 ${PN}-lore \ 31 ${PN}-lore \
32 ${PN}-mail \ 32 ${PN}-mail \
33 ${PN}-names \ 33 ${PN}-names \
34 ${PN}-news \ 34 ${PN}-news \
35 ${PN}-runner \ 35 ${PN}-runner \
36 ${PN}-web \ 36 ${PN}-web \
37 ${PN}-words \ 37 ${PN}-words \
38 ${PN}-flow \ 38 ${PN}-flow \
39 ${PN}-pair \ 39 ${PN}-pair \
40 ${PN}-core \ 40 ${PN}-core \
41" 41"
42 42
43RDEPENDS_${PN} = "python-core python-zopeinterface" 43RDEPENDS_${PN} = "python-core python-zopeinterface"
44RDEPENDS_${PN} += "\ 44RDEPENDS_${PN} += "\
45 ${PN}-bin \ 45 ${PN}-bin \
46 ${PN}-conch \ 46 ${PN}-conch \
47 ${PN}-lore \ 47 ${PN}-lore \
48 ${PN}-mail \ 48 ${PN}-mail \
49 ${PN}-names \ 49 ${PN}-names \
50 ${PN}-news \ 50 ${PN}-news \
51 ${PN}-runner \ 51 ${PN}-runner \
52 ${PN}-web \ 52 ${PN}-web \
53 ${PN}-words \ 53 ${PN}-words \
54" 54"
55 55
56ALLOW_EMPTY_${PN} = "1" 56ALLOW_EMPTY_${PN} = "1"
57FILES_${PN} = "" 57FILES_${PN} = ""
58 58
59FILES_${PN}-test = " \ 59FILES_${PN}-test = " \
60 ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ 60 ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
61 ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ 61 ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \
62" 62"
63 63
64FILES_${PN}-protocols = " \ 64FILES_${PN}-protocols = " \
65 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ 65 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \
66 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ 66 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \
67 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ 67 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \
68" 68"
69 69
70FILES_${PN}-zsh = " \ 70FILES_${PN}-zsh = " \
71 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ 71 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
72 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ 72 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
73" 73"
74 74
75FILES_${PN}-bin = " \ 75FILES_${PN}-bin = " \
76 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \ 76 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
77 ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \ 77 ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
78" 78"
79 79
80FILES_${PN}-conch = " \ 80FILES_${PN}-conch = " \
81 ${bindir}/ckeygen \ 81 ${bindir}/ckeygen \
82 ${bindir}/tkconch \ 82 ${bindir}/tkconch \
83 ${bindir}/conch \ 83 ${bindir}/conch \
84 ${bindir}/conchftp \ 84 ${bindir}/conchftp \
85 ${bindir}/cftp \ 85 ${bindir}/cftp \
86 ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ 86 ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
87 ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ 87 ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \
88" 88"
89 89
90FILES_${PN}-core = " \ 90FILES_${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"
15inherit autotools pythonnative 15inherit autotools pythonnative
16 16
17EXTRA_OECONF = " \ 17EXTRA_OECONF = " \
18 --with-python=${PYTHON} \ 18 --with-python=${PYTHON} \
19 --without-allegrocl \ 19 --without-allegrocl \
20 --without-android \ 20 --without-android \
21 --without-boost \ 21 --without-boost \
22 --without-chicken \ 22 --without-chicken \
23 --without-clisp \ 23 --without-clisp \
24 --without-csharp \ 24 --without-csharp \
25 --without-d \ 25 --without-d \
26 --without-gcj \ 26 --without-gcj \
27 --without-go \ 27 --without-go \
28 --without-guile \ 28 --without-guile \
29 --without-java \ 29 --without-java \
30 --without-lua \ 30 --without-lua \
31 --without-mzscheme \ 31 --without-mzscheme \
32 --without-ocaml \ 32 --without-ocaml \
33 --without-octave \ 33 --without-octave \
34 --without-perl5 \ 34 --without-perl5 \
35 --without-pike \ 35 --without-pike \
36 --without-php \ 36 --without-php \
37 --without-python3 \ 37 --without-python3 \
38 --without-r \ 38 --without-r \
39 --without-ruby \ 39 --without-ruby \
40 --without-tcl \ 40 --without-tcl \
41" 41"
42 42
43BBCLASSEXTEND = "native" 43BBCLASSEXTEND = "native"
44 44
45do_configure() { 45do_configure() {
46 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config 46 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/Tools/config
47 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config 47 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/Tools/config
48 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} 48 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
49 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} 49 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
50 oe_runconf 50 oe_runconf
51} 51}
52 52
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"
6DEPENDS = "tcl virtual/libx11 libxt" 6DEPENDS = "tcl virtual/libx11 libxt"
7 7
8SRC_URI = "\ 8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ 9 ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
10 file://confsearch.diff;striplevel=2 \ 10 file://confsearch.diff;striplevel=2 \
11 file://manpages.diff;striplevel=2 \ 11 file://manpages.diff;striplevel=2 \
12 file://non-linux.diff;striplevel=2 \ 12 file://non-linux.diff;striplevel=2 \
13 file://rpath.diff;striplevel=2 \ 13 file://rpath.diff;striplevel=2 \
14 file://tklibrary.diff;striplevel=2 \ 14 file://tklibrary.diff;striplevel=2 \
15 file://tkprivate.diff;striplevel=2 \ 15 file://tkprivate.diff;striplevel=2 \
16 file://fix-xft.diff \ 16 file://fix-xft.diff \
17" 17"
18SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6" 18SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6"
19SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4" 19SRC_URI[sha256sum] = "9737da5c30e631281062b6acbb4753840f9e95657c78e37657d9c520589ab2d4"
@@ -23,16 +23,16 @@ S = "${WORKDIR}/tk${PV}/unix"
23inherit autotools 23inherit autotools
24 24
25EXTRA_OECONF = "\ 25EXTRA_OECONF = "\
26 --enable-threads \ 26 --enable-threads \
27 --with-tcl=${STAGING_BINDIR_CROSS} \ 27 --with-tcl=${STAGING_BINDIR_CROSS} \
28 --x-includes=${STAGING_INCDIR} \ 28 --x-includes=${STAGING_INCDIR} \
29 --x-libraries=${STAGING_LIBDIR} \ 29 --x-libraries=${STAGING_LIBDIR} \
30" 30"
31 31
32do_install_append() { 32do_install_append() {
33 mv libtk8.5.so libtk8.5.so.0 33 mv libtk8.5.so libtk8.5.so.0
34 oe_libinstall -so libtk8.5 ${D}${libdir} 34 oe_libinstall -so libtk8.5 ${D}${libdir}
35 ln -sf wish8.5 ${D}${bindir}/wish 35 ln -sf wish8.5 ${D}${bindir}/wish
36} 36}
37 37
38PACKAGES =+ "${PN}-lib" 38PACKAGES =+ "${PN}-lib"