mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
Martin Jansa
be8c765c7c
There is new patch-status QA check in oe-core: https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a This is temporary work around just to hide _many_ warnings from optional patch-status (if you add it to WARN_QA). This just added Upstream-Status: Pending everywhere without actually investigating what's the proper status. This is just to hide current QA warnings and to catch new .patch files being added without Upstream-Status, but the number of Pending patches is now terrible: 5 (26%) meta-xfce 6 (50%) meta-perl 15 (42%) meta-webserver 21 (36%) meta-gnome 25 (57%) meta-filesystems 26 (43%) meta-initramfs 45 (45%) meta-python 47 (55%) meta-multimedia 312 (63%) meta-networking 756 (61%) meta-oe Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
Upstream-Status: Pending
|
|
|
|
diff -urN -x .git orig/cmake/LibreSSL.cmake patched/cmake/LibreSSL.cmake
|
|
--- orig/cmake/LibreSSL.cmake 2020-08-07 21:58:34.660773928 +0900
|
|
+++ patched/cmake/LibreSSL.cmake 2020-08-07 22:51:18.620767245 +0900
|
|
@@ -18,6 +18,9 @@
|
|
function(use_libre_ssl SOURCE_DIR BINARY_DIR)
|
|
message("Using bundled LibreSSL from release")
|
|
|
|
+ find_package(Patch REQUIRED)
|
|
+ set(PATCH "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch")
|
|
+
|
|
set(BYPRODUCT_PREFIX "lib" CACHE STRING "" FORCE)
|
|
set(BYPRODUCT_SUFFIX ".a" CACHE STRING "" FORCE)
|
|
|
|
@@ -27,16 +30,29 @@
|
|
set(BYPRODUCT_PREFIX "" CACHE STRING "" FORCE)
|
|
set(BUILD_ARGS " -GVisual Studio 15 2017")
|
|
endif(WIN32)
|
|
+
|
|
+ set(BYPRODUCTS
|
|
+ "lib/${BYPRODUCT_PREFIX}crypto${BYPRODUCT_SUFFIX}"
|
|
+ "lib/${BYPRODUCT_PREFIX}ssl${BYPRODUCT_SUFFIX}"
|
|
+ "lib/${BYPRODUCT_PREFIX}tls${BYPRODUCT_SUFFIX}"
|
|
+ )
|
|
+ set(LIBRESSL_INSTALL_DIR "${BINARY_DIR}/thirdparty/libressl-install" CACHE STRING "" FORCE)
|
|
+ FOREACH(BYPRODUCT ${BYPRODUCTS})
|
|
+ LIST(APPEND LIBRESSL_LIBRARIES_LIST "${LIBRESSL_INSTALL_DIR}/${BYPRODUCT}")
|
|
+ ENDFOREACH(BYPRODUCT)
|
|
+
|
|
ExternalProject_Add(
|
|
libressl-portable
|
|
URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz
|
|
URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477"
|
|
SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src"
|
|
+ PATCH_COMMAND ${PATCH}
|
|
CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
|
"-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install"
|
|
"-DLIBRESSL_APPS=OFF"
|
|
"-DLIBRESSL_TESTS=OFF"
|
|
"${BUILD_ARGS}"
|
|
+ BUILD_BYPRODUCTS ${LIBRESSL_LIBRARIES_LIST}
|
|
)
|
|
|
|
add_library(crypto STATIC IMPORTED)
|