mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-09 17:59:26 +00:00
thrift: Upgrade to 0.13
License-Update: Copyright years changed Fix build for multilib Use python3 during build Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+42
@@ -0,0 +1,42 @@
|
|||||||
|
From a07e56e1a2e70a9b81eb0a65f345cf45a7a93a81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Thu, 19 Dec 2019 21:56:23 -0800
|
||||||
|
Subject: [PATCH] DefineInstallationPaths.cmake: Define libdir in terms of
|
||||||
|
LIB_SUFFIX
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
build/cmake/DefineInstallationPaths.cmake | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- 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})")
|
||||||
|
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)")
|
||||||
|
+set(CMAKE_INSTALL_DIR "lib${LIB_SUFFIX}/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)")
|
||||||
|
+set(PKGCONFIG_INSTALL_DIR "lib${LIB_SUFFIX}/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)")
|
||||||
|
set(DOC_INSTALL_DIR "share/doc" CACHE PATH "The subdirectory to install documentation files (default: share/doc)")
|
||||||
|
set(prefix "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
set(exec_prefix "${CMAKE_INSTALL_PREFIX}/bin")
|
||||||
|
-set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
|
||||||
|
+set(libdir "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
||||||
|
set(includedir "${CMAKE_INSTALL_PREFIX}/include")
|
||||||
|
set(cmakedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DIR}")
|
||||||
|
--- a/build/cmake/DefineCMakeDefaults.cmake
|
||||||
|
+++ b/build/cmake/DefineCMakeDefaults.cmake
|
||||||
|
@@ -44,8 +44,8 @@ include(BuildType)
|
||||||
|
# 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.
|
||||||
|
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
|
||||||
|
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX})
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
#
|
||||||
+7
-6
@@ -4,18 +4,19 @@ HOMEPAGE = "https://thrift.apache.org/"
|
|||||||
|
|
||||||
LICENSE = "Apache-2.0"
|
LICENSE = "Apache-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=394465e125cffc0f133695ed43f14047 \
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=394465e125cffc0f133695ed43f14047 \
|
||||||
file://NOTICE;md5=42748ae4646b45fbfa5182807321fb6c"
|
file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73"
|
||||||
|
|
||||||
DEPENDS = "thrift-native boost flex-native bison-native openssl"
|
DEPENDS = "thrift-native boost flex-native bison-native openssl"
|
||||||
|
|
||||||
SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz"
|
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] = "3deebbb4d1ca77dd9c9e009a1ea02183"
|
"
|
||||||
SRC_URI[sha256sum] = "c336099532b765a6815173f62df0ed897528a9d551837d627c1f87fadad90428"
|
SRC_URI[md5sum] = "38a27d391a2b03214b444cb13d5664f1"
|
||||||
|
SRC_URI[sha256sum] = "7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
inherit pkgconfig cmake pythonnative
|
inherit pkgconfig cmake python3native
|
||||||
|
|
||||||
export STAGING_INCDIR
|
export STAGING_INCDIR
|
||||||
export STAGING_LIBDIR
|
export STAGING_LIBDIR
|
||||||
Reference in New Issue
Block a user