[nrf-ble-driver] Fix incorrect tag, version number & compilation with gcc-11.2.0 (#31873)

* [nrf-ble-driver] fix compilation with gcc 11.2.0

PR: https://github.com/NordicSemiconductor/pc-ble-driver/pull/272

* [nrf-ble-driver] fix version & use correct tag

- Fixed version inconsistency (#28036)
- Used correct tag with precompiled hex files
This commit is contained in:
Mickaël Thomas 2023-06-13 01:55:21 +02:00 committed by GitHub
parent 61f14c4a4e
commit 1ba9a2591f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 5 deletions

View File

@ -0,0 +1,22 @@
From 00791acc7c23ac2421102edd42a7fa562cc98bfd Mon Sep 17 00:00:00 2001
From: Krzysztof Rosinski <krzysiek@jrdltd.co.uk>
Date: Wed, 29 Dec 2021 09:47:40 +0100
Subject: [PATCH] fix compilation issue (gcc-11.2.0)
error: 'sleep_for' is not a member of 'std::this_thread'
---
src/common/transport/uart_transport.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/common/transport/uart_transport.cpp b/src/common/transport/uart_transport.cpp
index 1f063ff2..96e045fb 100644
--- a/src/common/transport/uart_transport.cpp
+++ b/src/common/transport/uart_transport.cpp
@@ -45,6 +45,7 @@
#include <mutex>
#include <sstream>
#include <system_error>
+#include <thread>
#if defined(__APPLE__)
#include <IOKit/serial/ioss.h>

View File

@ -9,12 +9,13 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO NordicSemiconductor/pc-ble-driver
REF v4.1.4
SHA512 8f35e757dddc27c9b11cdb3b9920562bbe09ceac715d65957e56ec8479e8ffedf12df2f976e484ed0d24b9325d9ef2b8ad6576cccefd2de8d7fa6fa8d58b03e5
REF v${VERSION}-hex
SHA512 1e8b5882aa3754a29a8f0ec11b8e70390db7ddf7bc50e1318adaaf4cd1ba2b787129d8003f8076ad39c35ec887ef3aeadbcb23fa5100b2be24956d118370cb84
HEAD_REF master
PATCHES
001-arm64-support.patch
support-arm64-osx.diff # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/271
gcc-11.2.0-compilation.patch # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/272
)
# Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH.
@ -34,8 +35,8 @@ vcpkg_cmake_configure(
OPTIONS
-DDISABLE_EXAMPLES=ON
-DDISABLE_TESTS=ON
-DNRF_BLE_DRIVER_VERSION=4.1.2
-DCONNECTIVITY_VERSION=4.1.2
-DNRF_BLE_DRIVER_VERSION=${VERSION}
-DCONNECTIVITY_VERSION=${VERSION}
${OPTIONS}
MAYBE_UNUSED_VARIABLES
DISABLE_EXAMPLES

View File

@ -1,6 +1,7 @@
{
"name": "nrf-ble-driver",
"version": "4.1.4",
"port-version": 1,
"description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.",
"homepage": "https://github.com/NordicSemiconductor/pc-ble-driver",
"license": "BSD-3-Clause",

View File

@ -5694,7 +5694,7 @@
},
"nrf-ble-driver": {
"baseline": "4.1.4",
"port-version": 0
"port-version": 1
},
"nspr": {
"baseline": "4.35",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4eaac577bc7f0f8d3bf2cc6281f96d848937ccaa",
"version": "4.1.4",
"port-version": 1
},
{
"git-tree": "f7eb0b4a2be63dfe15611d96725869023f7b438c",
"version": "4.1.4",