[oe-commits] Jeremy Lainé : wt: fix cross-compilation

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 77129c893941ccffaf671fe14f217966b6802f06
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=77129c893941ccffaf671fe14f217966b6802f06

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Sat Oct 18 11:20:52 2008 +0200

wt: fix cross-compilation

---

 packages/wt/files/cmakelist.patch |   18 ++++++++++++++++++
 packages/wt/wt_2.2.0.bb           |    6 +++++-
 2 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/packages/wt/files/cmakelist.patch b/packages/wt/files/cmakelist.patch
index 405914a..9e1eab1 100644
--- a/packages/wt/files/cmakelist.patch
+++ b/packages/wt/files/cmakelist.patch
@@ -1,3 +1,21 @@
+diff -urN wt-2.2.0.orig/src/CMakeLists.txt wt-2.2.0/src/CMakeLists.txt
+--- wt-2.2.0.orig/src/CMakeLists.txt	2008-09-10 15:58:34.000000000 +0200
++++ wt-2.2.0/src/CMakeLists.txt	2008-10-18 11:12:20.000000000 +0200
+@@ -33,8 +33,12 @@
+ 
+ LINK_DIRECTORIES(${BOOST_LIB_DIRS})
+ 
+-ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C)
+-GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION)
++IF(CMAKE_CROSSCOMPILING)
++  ADD_EXECUTABLE(filetostring web/skeleton/FileToString.C)
++  GET_TARGET_PROPERTY(FILE_TO_STRING_EXE filetostring LOCATION)
++ELSE(CMAKE_CROSSCOMPILING)
++  SET(FILE_TO_STRING_EXE ${CMAKE_CURRENT_SOURCE_DIR}/filetostring)
++ENDIF(CMAKE_CROSSCOMPILING)
+ 
+ MACRO (FILE_TO_STRING infile outfile var)
+ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${outfile}
 diff -urN wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt wt-2.2.0/src/Wt/Ext/CMakeLists.txt
 --- wt-2.2.0.orig/src/Wt/Ext/CMakeLists.txt	2008-07-15 08:25:54.000000000 +0200
 +++ wt-2.2.0/src/Wt/Ext/CMakeLists.txt	2008-10-17 22:37:38.000000000 +0200
diff --git a/packages/wt/wt_2.2.0.bb b/packages/wt/wt_2.2.0.bb
index 4bd1f37..16d8c55 100644
--- a/packages/wt/wt_2.2.0.bb
+++ b/packages/wt/wt_2.2.0.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "boost"
-FILE_PR = "r1"
+FILE_PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \
 	file://cmakelist.patch;patch=1"
@@ -15,6 +15,10 @@ inherit cmake
 
 STAGE_TEMP = "${WORKDIR}/temp-staging"
 
+do_configure_append() {
+	${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C
+}
+
 do_stage() {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}