diff mbox series

[meta-oe,1/8] android-tools: drop ${PE}, ${PR} from /usr/src/debug paths

Message ID 20231117085143.3813216-1-martin.jansa@gmail.com
State Accepted
Headers show
Series [meta-oe,1/8] android-tools: drop ${PE}, ${PR} from /usr/src/debug paths | expand

Commit Message

Martin Jansa Nov. 17, 2023, 8:51 a.m. UTC
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Jansa Nov. 17, 2023, 8:53 a.m. UTC | #1
All these depend on TARGET_DBGSRC_DIR variable added in pending oe-core
change:
https://lists.openembedded.org/g/openembedded-core/message/190815

On Fri, Nov 17, 2023 at 9:51 AM Martin Jansa <martin.jansa@gmail.com> wrote:

> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> ---
>  .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb   | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-devtools/android-tools/
> android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/
> android-tools_5.1.1.r37.bb
> index 9278146702..1c66ea4997 100644
> --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
> +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
> @@ -92,7 +92,7 @@ do_compile() {
>
>      # Setting both variables below causing our makefiles to not work with
>      # implicit make rules
> -
> CFLAGS="-ffile-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
> +    CFLAGS="-ffile-prefix-map=${S}=${TARGET_DBGSRC_DIR}"
>      unset CPPFLAGS
>
>      export SRCDIR=${S}
> --
> 2.42.1
>
>
Khem Raj Nov. 20, 2023, 5:49 p.m. UTC | #2
On Fri, 17 Nov 2023 09:51:36 +0100, Martin Jansa wrote:
> 


Applied, thanks!

[1/8] android-tools: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 3c20415c1a77336cfc23550ab89e424737fc0710
[2/8] minifi-cpp: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 54689e1468356e41d7ad5ae69fd588e4ca93ab73
[3/8] xmlrcp-c: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: dd0676e657e2f7dc84c8af7d97be01a2233f7496
[4/8] fluentbit: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 4f84234a272666e49579bc7468d67b257260c221
[5/8] ntpsec, net-snmp: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 2487442cfb7158183d868c1022d5183bc85aa166
[6/8] aom, x265: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 5d577748ca8b24e2408bda51a464ed3d7207cc6b
[7/8] python3-{h5py,pandas}: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 445b33e9b33ef56d517cb892b871b2272a4becf4
[8/8] evince, gnome-calendar, tracker: drop ${PE}, ${PR} from /usr/src/debug paths
      commit: 09142fe47984bd7ae0e00697404131dcd18f712f

Best regards,
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 9278146702..1c66ea4997 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
@@ -92,7 +92,7 @@  do_compile() {
 
     # Setting both variables below causing our makefiles to not work with
     # implicit make rules
-    CFLAGS="-ffile-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+    CFLAGS="-ffile-prefix-map=${S}=${TARGET_DBGSRC_DIR}"
     unset CPPFLAGS
 
     export SRCDIR=${S}