| From bcea253f5fa194e57f9564e8461c718e228bd26e Mon Sep 17 00:00:00 2001 |
| From: Indu Bhagat <indu.bhagat@oracle.com> |
| Date: Wed, 18 Jan 2023 23:17:49 -0800 |
| Subject: [PATCH 10/50] toplevel: Makefile.def: add install-strip dependency on |
| libsframe |
| |
| As noted in PR libsframe/30014 - FTBFS: install-strip fails because |
| bfdlib relinks and fails to find libsframe, the install time |
| dependencies of libbfd need to be updated. |
| |
| PR libsframe/30014 |
| * Makefile.def: Reflect that libsframe needs to installed before |
| libbfd. Reorder a bit to better track libsframe dependencies. |
| * Makefile.in: Regenerate. |
| |
| (cherry picked from commit b8d21eb0cd10d6127e77cc437d82e949adb0c454) |
| --- |
| Makefile.def | 5 ++++- |
| Makefile.in | 3 ++- |
| 2 files changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/Makefile.def |
| +++ b/Makefile.def |
| @@ -493,7 +493,6 @@ dependencies = { module=install-binutils |
| dependencies = { module=install-strip-binutils; on=install-strip-opcodes; }; |
| |
| // Likewise for ld, libctf, and bfd. |
| -dependencies = { module=install-bfd; on=install-libsframe; }; |
| dependencies = { module=install-libctf; on=install-bfd; }; |
| dependencies = { module=install-ld; on=install-bfd; }; |
| dependencies = { module=install-ld; on=install-libctf; }; |
| @@ -501,6 +500,10 @@ dependencies = { module=install-strip-li |
| dependencies = { module=install-strip-ld; on=install-strip-bfd; }; |
| dependencies = { module=install-strip-ld; on=install-strip-libctf; }; |
| |
| +// libbfd depends on libsframe |
| +dependencies = { module=install-bfd; on=install-libsframe; }; |
| +dependencies = { module=install-strip-bfd; on=install-strip-libsframe; }; |
| + |
| // libopcodes depends on libbfd |
| dependencies = { module=configure-opcodes; on=configure-bfd; hard=true; }; |
| dependencies = { module=install-opcodes; on=install-bfd; }; |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -64549,13 +64549,14 @@ all-stageautoprofile-binutils: maybe-all |
| all-stageautofeedback-binutils: maybe-all-stageautofeedback-libsframe |
| install-binutils: maybe-install-opcodes |
| install-strip-binutils: maybe-install-strip-opcodes |
| -install-bfd: maybe-install-libsframe |
| install-libctf: maybe-install-bfd |
| install-ld: maybe-install-bfd |
| install-ld: maybe-install-libctf |
| install-strip-libctf: maybe-install-strip-bfd |
| install-strip-ld: maybe-install-strip-bfd |
| install-strip-ld: maybe-install-strip-libctf |
| +install-bfd: maybe-install-libsframe |
| +install-strip-bfd: maybe-install-strip-libsframe |
| configure-opcodes: configure-bfd |
| configure-stage1-opcodes: configure-stage1-bfd |
| configure-stage2-opcodes: configure-stage2-bfd |