diff options
author | Philip Balister <philip@balister.org> | 2016-04-12 18:04:38 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-06 12:38:31 +0200 |
commit | 53adf32f49ce7ef82d9addbbfb9124f714c26494 (patch) | |
tree | 0523031d00ef3d406cfd81414c5f7d5f53774cd5 /meta-oe/recipes-connectivity/thrift | |
parent | f79a851b64ead15476d60012ff657c2329b00220 (diff) | |
download | meta-openembedded-contrib-53adf32f49ce7ef82d9addbbfb9124f714c26494.tar.gz |
thrift: Add recipe for Apache Thrift.
* Run tested cpp bindings with GNU Radio Control Port.
* The patch forcible removes Qt5 from configure. The disable is correct,
but doesn't prevent a cmake error looking for qmake during configure.
We do not need Qt5, so remove check. I suspect the issue might be in
Qt5 cmake files.
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity/thrift')
-rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb | 35 |
2 files changed, 62 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch new file mode 100644 index 0000000000..fcc2f08214 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch @@ -0,0 +1,27 @@ +From b3da0d8677b7e8467367a303c18551c56ed20e15 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Tue, 12 Apr 2016 17:30:15 -0400 +Subject: [PATCH] Forcibly disable check for Qt5. + +Signed-off-by: Philip Balister <philip@balister.org> +--- + build/cmake/DefineOptions.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake +index 62e240f..f8b4493 100644 +--- a/build/cmake/DefineOptions.cmake ++++ b/build/cmake/DefineOptions.cmake +@@ -52,9 +52,6 @@ CMAKE_DEPENDENT_OPTION(WITH_LIBEVENT "Build with libevent support" ON + find_package(Qt4 QUIET COMPONENTS QtCore QtNetwork) + CMAKE_DEPENDENT_OPTION(WITH_QT4 "Build with Qt4 support" ON + "QT4_FOUND" OFF) +-find_package(Qt5 QUIET COMPONENTS Core Network) +-CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON +- "Qt5_FOUND" OFF) + if(${WITH_QT4} AND ${WITH_QT5} AND ${CMAKE_MAJOR_VERSION} LESS 3) + # cmake < 3.0.0 causes conflict when building both Qt4 and Qt5 + set(WITH_QT4 OFF) +-- +2.5.5 + diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb new file mode 100644 index 0000000000..b6b73ade5d --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb @@ -0,0 +1,35 @@ +SUMMARY = "Apache Thrift" +DESCRIPTION = "A software framework, for scalable cross-language services development" +HOMEPAGE = "https://thrift.apache.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4ed21f679b2aafef26eac82ab0c2cbf" + +DEPENDS = "thrift-native boost python libevent flex-native bison-native \ + glib-2.0 openssl" + +SRC_URI = "git://git-wip-us.apache.org/repos/asf/thrift.git;protocol=https \ + file://0001-Forcibly-disable-check-for-Qt5.patch \ +" +SRCREV = "61b8a29b0704ccd81b520f2300f5d1bb261fea3e" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" + +inherit pkgconfig cmake pythonnative + +export STAGING_INCDIR +export STAGING_LIBDIR +export BUILD_SYS +export HOST_SYS + +EXTRA_OECMAKE = "-DWITH_QT4=OFF -DWITH_QT5=OFF" +EXTRA_OECMAKE_class-native = "-DWITH_QT4=OFF -DWITH_QT5=OFF \ + -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_CPP=OFF" +EXTRA_OECMAKE_class-nativesdk = "-DWITH_QT4=OFF -DWITH_QT5=OFF \ + -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_PYTHON=OFF" + +do_install_append () { + ln -sf thrift ${D}/${bindir}/thrift-compiler +} + |