Skip to contentSkip to conversation

gator-daemon: Do not specify header files in GATORD_CXX_SRC_FILES

PATCH Superseded Khem Raj 3 participants 5 messages Jun 26, 2021 – Jun 28, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 gator-daemon: Do not specify header files in GATORD_CXX_SRC_FILES

Cc Jon Mason <[email protected]>
Cc Ross Burton <[email protected]>
---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 31 +++++++++++++++++++
 .../gator-daemon/gator-daemon_7.7.0.bb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +31 -0
new file mode 100644
index 0000000..fc39f4e
@@ -0,0 +1,31 @@
+From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Jun 2021 14:19:10 -0700
+Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from
+ GATORD_CXX_SRC_FILES
+
+This otherwise appears in final linker cmdline and clang is not happy
+since it sees this as an output file along with the real output file
+specified with -o and bails out
+
+| clang-13: error: cannot specify -o when generating multiple output files
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ daemon/Sources.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/daemon/Sources.mk b/daemon/Sources.mk
+index 60d15ef..3e679f5 100644
+--- a/daemon/Sources.mk
++++ b/daemon/Sources.mk
+@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \
+     xml/EventsXMLProcessor.cpp \
+     xml/MxmlUtils.cpp \
+     xml/PmuXML.cpp \
+-    xml/PmuXMLParser.cpp \
+-    xml/PmuXMLParser.h
++    xml/PmuXMLParser.cpp
+-- 
+2.32.0
+
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +3 -1
index 61b1731..b3ba437 100644
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    "
 
 SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78"
-SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main"
+SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main \
+           file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2 \
+          "
 
 S = "${WORKDIR}/git/daemon"
 
Signature · 1 line
2.32.0
#1 lore raw
Quoted 17 lines · Khem Raj
Cc Jon Mason <[email protected]>
Cc Ross Burton <[email protected]>
---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 31 +++++++++++++++++++
 .../gator-daemon/gator-daemon_7.7.0.bb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +2 -0
new file mode 100644
index 0000000..fc39f4e
@@ -0,0 +1,31 @@
+From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>

meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch line 12

Quoted 10 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +10 -0
+Date: Sat, 26 Jun 2021 14:19:10 -0700
+Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from
+ GATORD_CXX_SRC_FILES
+
+This otherwise appears in final linker cmdline and clang is not happy
+since it sees this as an output file along with the real output file
+specified with -o and bails out
+
+| clang-13: error: cannot specify -o when generating multiple output files
+

Upstream-Status?

Quoted 37 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +19 -0
+Signed-off-by: Khem Raj <[email protected]>
+---
+ daemon/Sources.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/daemon/Sources.mk b/daemon/Sources.mk
+index 60d15ef..3e679f5 100644
+--- a/daemon/Sources.mk
++++ b/daemon/Sources.mk
+@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \
+     xml/EventsXMLProcessor.cpp \
+     xml/MxmlUtils.cpp \
+     xml/PmuXML.cpp \
+-    xml/PmuXMLParser.cpp \
+-    xml/PmuXMLParser.h
++    xml/PmuXMLParser.cpp
+-- 
+2.32.0
+
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +3 -1
index 61b1731..b3ba437 100644
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    "
 
 SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78"
-SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main"
+SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main \
+           file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2 \
+          "
 
 S = "${WORKDIR}/git/daemon"
 
Signature · 1 line
2.32.0
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
author
#2 lore raw
Quoted 32 lines · Denys Dmytriyenko
Quoted 8 lines · Khem Raj
Cc Jon Mason <[email protected]>
Cc Ross Burton <[email protected]>
---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 31 +++++++++++++++++++
 .../gator-daemon/gator-daemon_7.7.0.bb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644

meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch

Quoted 2 lines

diff --git

a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch

Quoted 4 lines

new file mode 100644
index 0000000..fc39f4e
--- /dev/null
+++

b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch

meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch line 11

Quoted 12 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +11 -0
@@ -0,0 +1,31 @@
+From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Jun 2021 14:19:10 -0700
+Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from
+ GATORD_CXX_SRC_FILES
+
+This otherwise appears in final linker cmdline and clang is not happy
+since it sees this as an output file along with the real output file
+specified with -o and bails out
+
+| clang-13: error: cannot specify -o when generating multiple output

files

Quoted 3 lines

Review line 12

Quoted 1 line
(quoted diff) +1 -0
+

Upstream-Status?

Pending

Quoted 53 lines

Review

Quoted 22 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +19 -0
+Signed-off-by: Khem Raj <[email protected]>
+---
+ daemon/Sources.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/daemon/Sources.mk b/daemon/Sources.mk
+index 60d15ef..3e679f5 100644
+--- a/daemon/Sources.mk
++++ b/daemon/Sources.mk
+@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \
+     xml/EventsXMLProcessor.cpp \
+     xml/MxmlUtils.cpp \
+     xml/PmuXML.cpp \
+-    xml/PmuXMLParser.cpp \
+-    xml/PmuXMLParser.h
++    xml/PmuXMLParser.cpp
+--
+2.32.0
+
(quoted diff) +0 -0

gator-daemon_7.7.0.bb b/meta-arm/recipes-devtools/gator-daemon/ gator-daemon_7.7.0.bb

meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb LIC_FILES_CHKSUM =

Quoted 4 lines

index 61b1731..b3ba437 100644

meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +0 -0
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \

Quoted 4 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +0 -1
                    "
 
 SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78"
-SRC_URI = "git://

github.com/ARM-software/gator.git;protocol=http;branch=main"

meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb LIC_FILES_CHKSUM = · line 19

Quoted 1 line
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +1 -0
+SRC_URI = "git://

github.com/ARM-software/gator.git;protocol=http;branch=main \

meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb LIC_FILES_CHKSUM = · line 20

Quoted 1 line
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +1 -0
+

file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2
\

Quoted 7 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +1 -1
+          "
 
 S = "${WORKDIR}/git/daemon"
 
--

2.32.0

--
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964

#3 lore raw

It makes me sad when we carry Pending patches for stuff that we own, so I send the pull request:

https://github.com/ARM-software/gator/pull/27

Please re-send with at least Submitted, unless that gets merged before you wake up. :)

Ross

Quoted 89 lines · Khem Raj
Quoted 23 lines · Denys Dmytriyenko
Quoted 21 lines · Khem Raj
Cc Jon Mason <[email protected]>
Cc Ross Burton <[email protected]>
---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 31 +++++++++++++++++++
 .../gator-daemon/gator-daemon_7.7.0.bb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +6 -0
new file mode 100644
index 0000000..fc39f4e
@@ -0,0 +1,31 @@
+From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Jun 2021 14:19:10 -0700
+Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from
+ GATORD_CXX_SRC_FILES
+
Quoted 8 lines

meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch line 12

Quoted 6 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +6 -0
+This otherwise appears in final linker cmdline and clang is not happy
+since it sees this as an output file along with the real output file
+specified with -o and bails out
+
+| clang-13: error: cannot specify -o when generating multiple output files
+

Upstream-Status?

Pending

Quoted 46 lines
Quoted 38 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +19 -0
+Signed-off-by: Khem Raj <[email protected]>
+---
+ daemon/Sources.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/daemon/Sources.mk b/daemon/Sources.mk
+index 60d15ef..3e679f5 100644
+--- a/daemon/Sources.mk
++++ b/daemon/Sources.mk
+@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \
+     xml/EventsXMLProcessor.cpp \
+     xml/MxmlUtils.cpp \
+     xml/PmuXML.cpp \
+-    xml/PmuXMLParser.cpp \
+-    xml/PmuXMLParser.h
++    xml/PmuXMLParser.cpp
+--
+2.32.0
+
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +3 -2
index 61b1731..b3ba437 100644
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    "
 
 SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78"
-SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main"
+SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main \
+           file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2 \
+          "
 
 S = "${WORKDIR}/git/daemon"
 
--
Quoted 2 lines

2.32.0

--
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964

#4 lore raw

Resend with Backport please :)

Ross

Quoted 101 lines · Ross Burton

It makes me sad when we carry Pending patches for stuff that we own, so I send the pull request:

https://github.com/ARM-software/gator/pull/27

Please re-send with at least Submitted, unless that gets merged before you wake up. :)

Ross

Quoted 89 lines · Khem Raj
Quoted 23 lines · Denys Dmytriyenko
Quoted 21 lines · Khem Raj
Cc Jon Mason <[email protected]>
Cc Ross Burton <[email protected]>
---
 ...e-xml-PmuXMLParser.h-header-from-GAT.patch | 31 +++++++++++++++++++
 .../gator-daemon/gator-daemon_7.7.0.bb        |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +6 -0
new file mode 100644
index 0000000..fc39f4e
@@ -0,0 +1,31 @@
+From 6f62c77f0a51de17b7f81f225ef483ed8214640e Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 26 Jun 2021 14:19:10 -0700
+Subject: [PATCH] Sources.mk: Remove xml/PmuXMLParser.h header from
+ GATORD_CXX_SRC_FILES
+
Quoted 8 lines

meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch line 12

Quoted 6 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +6 -0
+This otherwise appears in final linker cmdline and clang is not happy
+since it sees this as an output file along with the real output file
+specified with -o and bails out
+
+| clang-13: error: cannot specify -o when generating multiple output files
+

Upstream-Status?

Pending

Quoted 46 lines
Quoted 38 lines
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch new file +19 -0
+Signed-off-by: Khem Raj <[email protected]>
+---
+ daemon/Sources.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/daemon/Sources.mk b/daemon/Sources.mk
+index 60d15ef..3e679f5 100644
+--- a/daemon/Sources.mk
++++ b/daemon/Sources.mk
+@@ -147,5 +147,4 @@ GATORD_CXX_SRC_FILES := \
+     xml/EventsXMLProcessor.cpp \
+     xml/MxmlUtils.cpp \
+     xml/PmuXML.cpp \
+-    xml/PmuXMLParser.cpp \
+-    xml/PmuXMLParser.h
++    xml/PmuXMLParser.cpp
+--
+2.32.0
+
meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.7.0.bb +3 -2
index 61b1731..b3ba437 100644
@@ -16,7 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                    "
 
 SRCREV = "9d8d75fa08352470c51abc23fe3b314879bd8b78"
-SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main"
+SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main \
+           file://0001-Sources.mk-Remove-xml-PmuXMLParser.h-header-from-GAT.patch;striplevel=2 \
+          "
 
 S = "${WORKDIR}/git/daemon"
 
--
Quoted 2 lines

2.32.0

--
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964