From ccd022736a000026595452663b45b9d27c99a30e Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Fri, 6 Aug 2021 08:13:14 +0200 Subject: thrift: upgrade to 0.14.2 License-Update: Added new sections for new files Configuration changes: - BUILD_EXAMPLES - does not exist anymore - WITH_SHARED_LIB -> BUILD_SHARED_LIBS, WITH_STATIC_LIB are not to be allowed together - WITH_AS3=OFF - adobe action script 3 not available Added new options (disabled by default): - javascript, nodejs Signed-off-by: Andrej Valek Signed-off-by: Khem Raj --- ...llationPaths.cmake-Define-libdir-in-terms.patch | 8 +-- .../recipes-connectivity/thrift/thrift_0.13.0.bb | 63 --------------------- .../recipes-connectivity/thrift/thrift_0.14.2.bb | 65 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 67 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb create mode 100644 meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch b/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch index 485d7a4b0b..e1e474ab0a 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch +++ b/meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch @@ -12,9 +12,9 @@ Signed-off-by: Khem Raj --- a/build/cmake/DefineInstallationPaths.cmake +++ b/build/cmake/DefineInstallationPaths.cmake -@@ -22,11 +22,11 @@ - set(BIN_INSTALL_DIR "bin" CACHE PATH "The binary install dir (default: bin)") - set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") +@@ -26,11 +26,11 @@ + set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") + endif() set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The library install dir (default: include)") -set(CMAKE_INSTALL_DIR "lib/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") -set(PKGCONFIG_INSTALL_DIR "lib/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj set(cmakedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DIR}") --- a/build/cmake/DefineCMakeDefaults.cmake +++ b/build/cmake/DefineCMakeDefaults.cmake -@@ -44,8 +44,8 @@ include(BuildType) +@@ -44,8 +44,8 @@ # top of the build tree rather than in hard-to-find leaf # directories. This simplifies manual testing and the use of the build # tree rather than installed thrift libraries. diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb deleted file mode 100644 index 5a09697102..0000000000 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb +++ /dev/null @@ -1,63 +0,0 @@ -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=394465e125cffc0f133695ed43f14047 \ - file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" - -DEPENDS = "thrift-native boost flex-native bison-native openssl" - -SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ - file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ - " -SRC_URI[md5sum] = "38a27d391a2b03214b444cb13d5664f1" -SRC_URI[sha256sum] = "7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179" - -BBCLASSEXTEND = "native nativesdk" - -inherit pkgconfig cmake python3native - -export STAGING_INCDIR -export STAGING_LIBDIR -export BUILD_SYS -export HOST_SYS - -EXTRA_OECMAKE = " \ - -DBUILD_LIBRARIES=ON \ - -DBUILD_COMPILER=ON \ - -DBUILD_TESTING=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DWITH_CPP=ON \ - -DWITH_JAVA=OFF \ - -DWITH_PYTHON=OFF \ - -DWITH_STATIC_LIB=ON \ - -DWITH_SHARED_LIB=ON \ - -DWITH_OPENSSL=ON \ - -DWITH_QT5=OFF \ -" - -PACKAGECONFIG ??= "libevent glib" -PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" -PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" - -do_install:append () { - ln -sf thrift ${D}/${bindir}/thrift-compiler -} - -LEAD_SONAME = "libthrift.so.${PV}" - -# thrift packages -PACKAGE_BEFORE_PN = "${PN}-compiler lib${BPN} lib${BPN}z lib${BPN}nb lib${BPN}-c-glib" -FILES:lib${BPN} = "${libdir}/libthrift.so.*" -FILES:lib${BPN}z = "${libdir}/libthriftz.so.*" -FILES:lib${BPN}nb = "${libdir}/libthriftnb.so.*" -FILES:lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" -FILES:${PN}-compiler = "${bindir}/*" - -# The thrift packages just pulls in some default dependencies but is otherwise empty -RRECOMMENDS:${PN} = "${PN}-compiler lib${BPN}" -ALLOW_EMPTY:${PN} = "1" -RRECOMMENDS:${PN}:class-native = "" -RRECOMMENDS:${PN}:class-nativesdk = "" diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb new file mode 100644 index 0000000000..014613e5d6 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.14.2.bb @@ -0,0 +1,65 @@ +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=c40a383cb3f747e0c7abbf1482f194f0 \ + file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" + +DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" + +SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ + file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + " +SRC_URI[md5sum] = "284a48df355aa3910687ee9b894d3ae8" +SRC_URI[sha256sum] = "4191bfc0b7490e20cc69f9f4dc6e991fbb612d4551aa9eef1dbf7f4c47ce554d" + +BBCLASSEXTEND = "native nativesdk" + +inherit pkgconfig cmake python3native + +export STAGING_INCDIR +export STAGING_LIBDIR +export BUILD_SYS +export HOST_SYS + +EXTRA_OECMAKE = " \ + -DBUILD_LIBRARIES=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_COMPILER=ON \ + -DBUILD_TESTING=OFF \ + -DBUILD_TUTORIALS=OFF \ + -DWITH_AS3=OFF \ + -DWITH_CPP=ON \ + -DWITH_JAVA=OFF \ + -DWITH_OPENSSL=ON \ + -DWITH_QT5=OFF \ + -DWITH_ZLIB=ON \ +" + +PACKAGECONFIG ??= "glib libevent" +PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" +PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" +PACKAGECONFIG[javascript] = "-DWITH_JAVASCRIPT=ON,-DWITH_JAVASCRIPT=OFF,nodejs" +PACKAGECONFIG[nodejs] = "-DWITH_NODEJS=ON,-DWITH_NODEJS=OFF,nodejs" +PACKAGECONFIG[python] = "-DWITH_PYTHON=ON,-DWITH_PYTHON=OFF,python" + +do_install:append () { + ln -sf thrift ${D}/${bindir}/thrift-compiler +} + +LEAD_SONAME = "libthrift.so.${PV}" + +# thrift packages +PACKAGE_BEFORE_PN = "${PN}-compiler lib${BPN} lib${BPN}z lib${BPN}nb lib${BPN}-c-glib" +FILES:lib${BPN} = "${libdir}/libthrift.so.*" +FILES:lib${BPN}z = "${libdir}/libthriftz.so.*" +FILES:lib${BPN}nb = "${libdir}/libthriftnb.so.*" +FILES:lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" +FILES:${PN}-compiler = "${bindir}/*" + +# The thrift packages just pulls in some default dependencies but is otherwise empty +RRECOMMENDS:${PN} = "${PN}-compiler lib${BPN}" +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN}:class-native = "" +RRECOMMENDS:${PN}:class-nativesdk = "" -- cgit v1.2.3-54-g00ecf