From 4418916620496fd66cde0b3d5e241bed0a4c18a3 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Wed, 28 Aug 2024 15:27:02 +0000 Subject: [PATCH] add patch --- .github/workflows/bt_makefile.patch | 29 +++++++++++++++++++++++++++++ .github/workflows/presubmit.yml | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/bt_makefile.patch diff --git a/.github/workflows/bt_makefile.patch b/.github/workflows/bt_makefile.patch new file mode 100644 index 00000000..e31f07e3 --- /dev/null +++ b/.github/workflows/bt_makefile.patch @@ -0,0 +1,29 @@ +From 41115106fc5f1f677e42a51929771995f53eed07 Mon Sep 17 00:00:00 2001 +From: Simon Marchi +Date: Wed, 28 Aug 2024 11:22:21 -0400 +Subject: [PATCH] Use LTTNGCTL_CFLAGS + +Change-Id: I5c50340ada0e7942ac24df1f2deba1f27bf04132 +--- + src/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index c6146cec5b24..32b553eb38f3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -767,6 +767,10 @@ plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \ + plugins/ctf/lttng-live/viewer-connection.hpp \ + plugins/ctf/plugin.cpp + ++plugins_ctf_babeltrace_plugin_ctf_la_CXXFLAGS = \ ++ $(AM_CXXFLAGS) \ ++ $(LTTNGCTL_CFLAGS) ++ + plugins_ctf_babeltrace_plugin_ctf_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + +base-commit: 5d357b9284e77562cbe7d5397def89f686704422 +-- +2.46.0 diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index c3b02a14..bd1fa01f 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -62,6 +62,8 @@ jobs: - run: | wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch patch -p1 < str_nullptr.patch + wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/bt_makefile.patch + patch -p1 < bt_makefile.patch working-directory: babeltrace if: steps.babeltrace2.outputs.cache-hit != 'true' - run: |