| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From bcea253f5fa194e57f9564e8461c718e228bd26e Mon Sep 17 00:00:00 2001 |
| 2 | From: Indu Bhagat <indu.bhagat@oracle.com> |
| 3 | Date: Wed, 18 Jan 2023 23:17:49 -0800 |
| 4 | Subject: [PATCH 10/50] toplevel: Makefile.def: add install-strip dependency on |
| 5 | libsframe |
| 6 | |
| 7 | As noted in PR libsframe/30014 - FTBFS: install-strip fails because |
| 8 | bfdlib relinks and fails to find libsframe, the install time |
| 9 | dependencies of libbfd need to be updated. |
| 10 | |
| 11 | PR libsframe/30014 |
| 12 | * Makefile.def: Reflect that libsframe needs to installed before |
| 13 | libbfd. Reorder a bit to better track libsframe dependencies. |
| 14 | * Makefile.in: Regenerate. |
| 15 | |
| 16 | (cherry picked from commit b8d21eb0cd10d6127e77cc437d82e949adb0c454) |
| 17 | --- |
| 18 | Makefile.def | 5 ++++- |
| 19 | Makefile.in | 3 ++- |
| 20 | 2 files changed, 6 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | --- a/Makefile.def |
| 23 | +++ b/Makefile.def |
| 24 | @@ -493,7 +493,6 @@ dependencies = { module=install-binutils |
| 25 | dependencies = { module=install-strip-binutils; on=install-strip-opcodes; }; |
| 26 | |
| 27 | // Likewise for ld, libctf, and bfd. |
| 28 | -dependencies = { module=install-bfd; on=install-libsframe; }; |
| 29 | dependencies = { module=install-libctf; on=install-bfd; }; |
| 30 | dependencies = { module=install-ld; on=install-bfd; }; |
| 31 | dependencies = { module=install-ld; on=install-libctf; }; |
| 32 | @@ -501,6 +500,10 @@ dependencies = { module=install-strip-li |
| 33 | dependencies = { module=install-strip-ld; on=install-strip-bfd; }; |
| 34 | dependencies = { module=install-strip-ld; on=install-strip-libctf; }; |
| 35 | |
| 36 | +// libbfd depends on libsframe |
| 37 | +dependencies = { module=install-bfd; on=install-libsframe; }; |
| 38 | +dependencies = { module=install-strip-bfd; on=install-strip-libsframe; }; |
| 39 | + |
| 40 | // libopcodes depends on libbfd |
| 41 | dependencies = { module=configure-opcodes; on=configure-bfd; hard=true; }; |
| 42 | dependencies = { module=install-opcodes; on=install-bfd; }; |
| 43 | --- a/Makefile.in |
| 44 | +++ b/Makefile.in |
| 45 | @@ -64549,13 +64549,14 @@ all-stageautoprofile-binutils: maybe-all |
| 46 | all-stageautofeedback-binutils: maybe-all-stageautofeedback-libsframe |
| 47 | install-binutils: maybe-install-opcodes |
| 48 | install-strip-binutils: maybe-install-strip-opcodes |
| 49 | -install-bfd: maybe-install-libsframe |
| 50 | install-libctf: maybe-install-bfd |
| 51 | install-ld: maybe-install-bfd |
| 52 | install-ld: maybe-install-libctf |
| 53 | install-strip-libctf: maybe-install-strip-bfd |
| 54 | install-strip-ld: maybe-install-strip-bfd |
| 55 | install-strip-ld: maybe-install-strip-libctf |
| 56 | +install-bfd: maybe-install-libsframe |
| 57 | +install-strip-bfd: maybe-install-strip-libsframe |
| 58 | configure-opcodes: configure-bfd |
| 59 | configure-stage1-opcodes: configure-stage1-bfd |
| 60 | configure-stage2-opcodes: configure-stage2-bfd |