summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/utility-tasks.bbclass5
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb3
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb5
-rw-r--r--meta/recipes-support/pth/pth_2.0.7.bb31
4 files changed, 1 insertions, 43 deletions
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index e817b899a6..f62d523f5a 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -43,11 +43,8 @@ python do_checkuri() {
43 if len(src_uri) == 0: 43 if len(src_uri) == 0:
44 return 44 return
45 45
46 localdata = bb.data.createCopy(d)
47 bb.data.update_data(localdata)
48
49 try: 46 try:
50 fetcher = bb.fetch2.Fetch(src_uri, localdata) 47 fetcher = bb.fetch2.Fetch(src_uri, d)
51 fetcher.checkstatus() 48 fetcher.checkstatus()
52 except bb.fetch2.BBFetchException, e: 49 except bb.fetch2.BBFetchException, e:
53 raise bb.build.FuncFailed(e) 50 raise bb.build.FuncFailed(e)
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index bb8371e207..15024cf152 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -150,7 +150,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
150 perl-dev \ 150 perl-dev \
151 perl-modules \ 151 perl-modules \
152 perl-pod \ 152 perl-pod \
153 ${PTH} \
154 python \ 153 python \
155 python-compiler \ 154 python-compiler \
156 python-git \ 155 python-git \
@@ -198,5 +197,3 @@ RDEPENDS_packagegroup-self-hosted-graphics = "\
198 pcmanfm \ 197 pcmanfm \
199 vte \ 198 vte \
200 " 199 "
201PTH = "pth"
202PTH_libc-uclibc = ""
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index be08c580eb..a29c3d762e 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -69,7 +69,6 @@ RDEPENDS_packagegroup-core-sys-extended = "\
69 minicom \ 69 minicom \
70 neon \ 70 neon \
71 parted \ 71 parted \
72 ${PTH} \
73 quota \ 72 quota \
74 screen \ 73 screen \
75 setserial \ 74 setserial \
@@ -282,7 +281,3 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\
282 libi18n-collate-perl \ 281 libi18n-collate-perl \
283 libpod-plainer-perl \ 282 libpod-plainer-perl \
284" 283"
285
286PTH = "pth"
287PTH_libc-uclibc = ""
288
diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb
deleted file mode 100644
index 9037769b79..0000000000
--- a/meta/recipes-support/pth/pth_2.0.7.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "GNU Portable Threads library"
2HOMEPAGE = "http://www.gnu.org/software/pth/"
3SECTION = "libs"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222cafd37f24370a77b1"
6PR = "r3"
7
8python __anonymous () {
9 import re
10 uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None)
11 if uc_os:
12 raise bb.parse.SkipPackage("incompatible with uClibc")
13}
14
15SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \
16 file://pth-add-pkgconfig-support.patch \
17 file://pth-fix-parallel.patch \
18 "
19
20SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793"
21SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232"
22
23BINCONFIG = "${bindir}/pth-config"
24
25inherit autotools binconfig-disabled pkgconfig
26
27do_configure() {
28 ( cd ${S}; gnu-configize )
29 ( cd ${S}; autoconf )
30 oe_runconf
31}