hiredis: Enable SSL/TLS support by default
PATCH 1/4 hiredis: Enable SSL/TLS support by default
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-extended/hiredis/hiredis_1.0.2.bb +3 -1
@@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/redis/hiredis" SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" -DEPENDS = "redis" +DEPENDS = "redis openssl" SRC_URI = "git://github.com/redis/hiredis;protocol=https;branch=master" SRCREV = "b731283245f3183af527237166261ad0768ba7d4"
@@ -11,3 +11,5 @@ SRCREV = "b731283245f3183af527237166261ad0768ba7d4" S = "${WORKDIR}/git" inherit cmake + +EXTRA_OECMAKE += "-DENABLE_SSL=ON"
Signature · 1 line
2.39.1
PATCH 2/4 redis-plus-plus: Enable SSL/TLS by default
Makes the build consistent and it does not look into native sysroot for ssl
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb +3 -1
@@ -12,7 +12,9 @@ S = "${WORKDIR}/git" inherit cmake -DEPENDS += "hiredis" +EXTRA_OECMAKE += "-DREDIS_PLUS_PLUS_USE_TLS=ON" + +DEPENDS += "hiredis openssl" RDEPENDS:${PN} += "hiredis"
Signature · 1 line
2.39.1
PATCH 3/4 htop: fix Upstream-Status format
In reply to Khem RajFrom: Martin Jansa <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +1 -2
@@ -9,8 +9,7 @@ ncurses*-config applications. Signed-off-by: Paul Barker <[email protected]> Signed-off-by: Robert Joslyn <[email protected]> -Upstream-status: Inappropriate - (`ncurses*-config` can be used outside of OpenEmbedded) +Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] --- configure.ac | 12 ++++++------
Signature · 1 line
2.39.1
PATCH 4/4 rocksdb: Fix build with clang compiler
In reply to Khem RajNeed to drop using -msse4.2 -mpclmul
Signed-off-by Khem Raj <[email protected]>
--- ...-Do-not-add-msse4.2-mpclmul-on-clang.patch | 33 +++++++++++++++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch
meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch new file +33 -0
@@ -0,0 +1,33 @@ +From cedc84a8db468d0b6652e78a8a6667e655586b53 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 26 Jan 2023 13:00:43 -0800 +Subject: [PATCH] cmake: Do not add -msse4.2 -mpclmul on clang + +When testcase is compiled with clang and -msse4.2 -mpclmul is added to +cxxflags then clang -m32 still ends up compiling the test case which is +not correct for i386, therefore depend on yocto to pass the right flags +from environemnt via cflags rather than manufecture them here + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbef059028..981545a4e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -290,7 +290,7 @@ endif() + + include(CheckCXXSourceCompiles) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) +-if(NOT MSVC) ++if(NOT MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul") + endif() + +-- +2.39.1 +
meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \ file://ppc64.patch \ file://mips.patch \ file://arm.patch \
Signature · 1 line
2.39.1