Merge branch 'bugfix/cache_refresh_compilation_issue_v5.4' into 'release/v5.4'

fix(nimble): Fix build when gatt client disabled (v5.4)

See merge request espressif/esp-idf!52817

components/bt/host/nimble/Kconfig.in

@@ -322,6 +322,17 @@ menu "GAP"
             Use this option to do host based Random Private Address resolution.
             This option is valid only for ESP32
 
+    config BT_NIMBLE_HOST_BASED_PRIVACY_RESOLVE_ON_SCAN
+        bool "Resolve peer RPA while scanning"
+        default y
+        depends on BT_NIMBLE_HOST_BASED_PRIVACY
+        help
+            Enable this option to resolve peer Resolvable Private Addresses (RPAs)
+            to their identity addresses in scan results. This is useful when an
+            application needs to identify a peer while scanning, for example, to
+            match a bonded device. When disabled, scan results retain the peer's
+            on-air RPA, and the RPA is resolved when the connection is established.
+
     config BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
         bool "Allow Connections with scanning in progress"
         depends on BT_NIMBLE_ENABLED && !(IDF_TARGET_ESP32C2)

components/bt/host/nimble/port/include/esp_nimble_cfg.h

@@ -989,6 +989,14 @@
 
 #endif
 
+#ifndef MYNEWT_VAL_BLE_HOST_BASED_PRIVACY_RESOLVE_ON_SCAN
+#ifdef CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY_RESOLVE_ON_SCAN
+#define MYNEWT_VAL_BLE_HOST_BASED_PRIVACY_RESOLVE_ON_SCAN (1)
+#else
+#define MYNEWT_VAL_BLE_HOST_BASED_PRIVACY_RESOLVE_ON_SCAN (0)
+#endif
+#endif
+
 #ifndef MYNEWT_VAL_BLE_RPA_TIMEOUT
 #define MYNEWT_VAL_BLE_RPA_TIMEOUT (CONFIG_BT_NIMBLE_RPA_TIMEOUT)
 #endif