package/apitrace: remove stale patch
Running the command:
make apitrace-patch
fails with error:
Applying 0003-Explicit-header-stdint.patch using patch:
patching file frametrim/ft_dependecyobject.hpp
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file frametrim/ft_dependecyobject.hpp.rej
patching file retrace/metric_writer.cpp
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file retrace/metric_writer.cpp.rej
Commit [1] "package/apitrace: fix build with GCC 15.x" introduced a
package patch in the branch master while Buildroot was in RC cycle.
This same commit was cherry-picked in [2] in the branch "next" to also
apply cleanly the patch for commit [3] "package/apitrace: bump to
version 13".
The merge commit [4] kept the apitrace package patch
"0003-Explicit-header-stdint.patch".
This commit fixes the issue by removing this stale patch.
[1] a4b0913280
[2] bf55f4713e
[3] aec2f2ddc4
[4] 0af159ae2b
Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
8988278241
commit
6615c1bed8
@@ -1,42 +0,0 @@
|
||||
From 3cc8956995d6d702a2c3ef0d7f91500c6accbfad Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
|
||||
Date: Fri, 21 Mar 2025 05:02:23 +0000
|
||||
Subject: [PATCH] Explicit header: stdint
|
||||
|
||||
Fix building with GCC-15. It no longer includes it by default.
|
||||
|
||||
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
|
||||
Upstream: 952bad1469ea747012bdc48c48993bd5f13eec04
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
frametrim/ft_dependecyobject.hpp | 1 +
|
||||
retrace/metric_writer.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/frametrim/ft_dependecyobject.hpp b/frametrim/ft_dependecyobject.hpp
|
||||
index cf1885f1..53b910d0 100644
|
||||
--- a/frametrim/ft_dependecyobject.hpp
|
||||
+++ b/frametrim/ft_dependecyobject.hpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "ft_tracecall.hpp"
|
||||
+#include <stdint.h>
|
||||
|
||||
namespace frametrim {
|
||||
|
||||
diff --git a/retrace/metric_writer.cpp b/retrace/metric_writer.cpp
|
||||
index e923ed1d..4e4ce748 100644
|
||||
--- a/retrace/metric_writer.cpp
|
||||
+++ b/retrace/metric_writer.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
**************************************************************************/
|
||||
|
||||
#include <iostream>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include "metric_writer.hpp"
|
||||
|
||||
--
|
||||
2.50.1
|
||||
|
||||
Reference in New Issue
Block a user