From d5649d5afdf4180de0170b627bf3eaa484513b51 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Sep 2022 17:38:31 +0200 Subject: [PATCH] package/hawktracer: bump to latest git commit Drop patch (merged upstream) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...eatures.cmake-fix-DENABLE_CPU_USAGE_.patch | 38 ------------------- package/hawktracer/hawktracer.hash | 2 +- package/hawktracer/hawktracer.mk | 2 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/hawktracer/0001-cmake-platform_features.cmake-fix-DENABLE_CPU_USAGE_.patch diff --git a/package/hawktracer/0001-cmake-platform_features.cmake-fix-DENABLE_CPU_USAGE_.patch b/package/hawktracer/0001-cmake-platform_features.cmake-fix-DENABLE_CPU_USAGE_.patch deleted file mode 100644 index 5c8e6e9e65..0000000000 --- a/package/hawktracer/0001-cmake-platform_features.cmake-fix-DENABLE_CPU_USAGE_.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 65e78e2b972e2fab76b18732941ae611ec782dee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 12 Aug 2022 14:51:33 +0200 -Subject: [PATCH] cmake/platform_features.cmake: fix - -DENABLE_CPU_USAGE_FEATURE=OFF - -Fix -DENABLE_CPU_USAGE_FEATURE=OFF to allow the user to disable -CPU_USAGE and avoid the following build failure without threads: - -/home/giuliobenetti/autobuild/run/instance-2/output-1/build/hawktracer-e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8/lib/platform/linux/cpu_usage.c:5:10: fatal error: pthread.h: No such file or directory - 5 | #include - | ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/7edc29e21e441e66ad7c4df1673e506950930913 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/amzn/hawktracer/pull/86] ---- - cmake/platform_features.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/platform_features.cmake b/cmake/platform_features.cmake -index 1abbd41..8d7cfd9 100644 ---- a/cmake/platform_features.cmake -+++ b/cmake/platform_features.cmake -@@ -18,7 +18,7 @@ macro(_validate_feature_enabled FEATURE_NAME VARIABLE) - endmacro(_validate_feature_enabled) - - macro(define_platform_feature FEATURE_NAME FEATURE_DEFAULT_FILE DEFAULT_ENABLE) -- if (NOT "${DEFAULT_ENABLE}" STREQUAL "OFF" OR "${ENABLE_${FEATURE_NAME}_FEATURE}" STREQUAL "ON") -+ if (NOT "${DEFAULT_ENABLE}" STREQUAL "OFF" AND NOT "${ENABLE_${FEATURE_NAME}_FEATURE}" STREQUAL "OFF") - set(OPTION_VALUE ON) - else() - set(OPTION_VALUE OFF) --- -2.35.1 - diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash index 87aa67c4b6..47a8b35b6b 100644 --- a/package/hawktracer/hawktracer.hash +++ b/package/hawktracer/hawktracer.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 b6c7fdfbe8178bc7ba49ef840ec18a92d1488ad73ac9f64d2a09042410ad3ef4 hawktracer-e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8.tar.gz +sha256 a48e26082fd644222d4a20ecfd5a34700865cf572d41b7eac5b0c8242fef9c5f hawktracer-2ec19d71923344148928ef45fce549eda67030a4.tar.gz sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk index a14e2e2528..fd635e350d 100644 --- a/package/hawktracer/hawktracer.mk +++ b/package/hawktracer/hawktracer.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAWKTRACER_VERSION = e53b07bc812c4cfe8f6253ddb48ac43de8fa74a8 +HAWKTRACER_VERSION = 2ec19d71923344148928ef45fce549eda67030a4 HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) HAWKTRACER_LICENSE = MIT HAWKTRACER_LICENSE_FILES = LICENSE