wt3: build outside the source tree

this builds wt3 outside the source tree.
not doing so is not the recommended solution and actually breaks in 3.1.0
fixed it to use a build dir
while at it also inlined the checksums and removed them from checksums.ini

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 15b6fbf..950dd43 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28342,10 +28342,6 @@ sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
 md5=3d35c181dfab7dfd3fe898738dffb421
 sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
 
-[http://downloads.sourceforge.net/witty/wt-3.0.0.tar.gz]
-md5=ba03acf8089dff38e106661aa1ecdcb9
-sha256=d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28
-
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4

diff --git a/recipes/wt/wt3.inc b/recipes/wt/wt3.inc
index 1734212..db4e95d 100644 (file)
--- a/recipes/wt/wt3.inc
+++ b/recipes/wt/wt3.inc
@@ -5,12 +5,12 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.webtoolkit.eu/wt"
 DEPENDS = "boost zlib openssl"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 # package wt3 is for wt 2.99 and wt 3.*
 # the api of these versions is incompatible with 2.*
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz;name=tarball \
        file://ext.patch;patch=1 \
        file://wgooglemap.patch;patch=1"
 
@@ -21,9 +21,11 @@ FILES_${PN}-dev += "${datadir}/cmake-2.*"
 
 S = "${WORKDIR}/wt-${PV}"
 
+OECMAKE_BUILDPATH = "build"
+
 inherit cmake
 
+
 EXTRA_OECMAKE = "-DBOOST_DIR=${STAGING_DIR_HOST}${prefix} \
-                -DUseQt4=0 \
+                -DUseQt4=0 ../ \
                 "
-

diff --git a/recipes/wt/wt3_3.0.0.bb b/recipes/wt/wt3_3.0.0.bb
index 665590a..69c9abd 100644 (file)
--- a/recipes/wt/wt3_3.0.0.bb
+++ b/recipes/wt/wt3_3.0.0.bb
@@ -1,6 +1,8 @@
 require wt3.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://noqt.patch;patch=1"
 
+SRC_URI[tarball.md5sum] = "ba03acf8089dff38e106661aa1ecdcb9"
+SRC_URI[tarball.sha256sum] = "d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28"