Skip to content

Conversation

tkelman
Copy link
Contributor

@tkelman tkelman commented Jan 16, 2025

Description

fix #5594 - missed osx parts that should have included in #5565

handle lief 0.15 renaming of LOAD_COMMAND_TYPES

https://lief.re/doc/stable/changelog.html#july-21th-2024

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@tkelman tkelman requested a review from a team as a code owner January 16, 2025 19:56
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jan 16, 2025
Copy link

codspeed-hq bot commented Jan 16, 2025

CodSpeed Performance Report

Merging #5595 will not alter performance

Comparing tkelman:lief-load-command-types (074df06) with 25.1.x (6873259)

Summary

✅ 5 untouched benchmarks

@tkelman tkelman mentioned this pull request Jan 16, 2025
2 tasks
@h-vetinari
Copy link
Contributor

Thanks a lot for the PR! Given that this still breaks with 0.15 (and thus the version that conda-build 25.1 claimed compatibility to), I think it would be a good idea to backport this patch.

@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

I see you've got 25.1.x and 24.11.x branches here, but I don't think #5565 was included in 24.11.x. would you like me to open a separate PR, or change the target branch, or will you handle the cherry-picking?

@h-vetinari
Copy link
Contributor

No need for action right now. First off, a backport is not my decision, and secondly, I think it needs to land on main first anyway

@jaimergp
Copy link
Contributor

I think we can tsrhet 25.1.x. That branch will be synced with main later.

jaimergp
jaimergp previously approved these changes Jan 17, 2025
@tkelman tkelman changed the title handle lief 0.15 renaming of LOAD_COMMAND_TYPES handle lief 0.15 renaming of LOAD_COMMAND_TYPES and ELF_CLASS Jan 17, 2025
@h-vetinari
Copy link
Contributor

h-vetinari commented Jan 17, 2025

I think we can target 25.1.x.

Could you retarget the branch then? Contributors can't do it, it needs maintainer rights

Edit: apparently, I was wrong. 🤷 🙃

@tkelman tkelman changed the base branch from main to 25.1.x January 17, 2025 10:47
@tkelman tkelman changed the base branch from 25.1.x to main January 17, 2025 10:48
@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

I tried that out but it looked a little messy adding in 4 unrelated commits that exist on main but not the 25.1.x branch

@h-vetinari
Copy link
Contributor

it looked a little messy adding in 4 unrelated commits that exist on main but not the 25.1.x branch

Obviously you'd have to rebase out those commits. git rebase -i 25.1.x and then remove those commits that aren't yours.

@tkelman tkelman force-pushed the lief-load-command-types branch from f96a7ee to 642f9bc Compare January 17, 2025 11:11
@tkelman tkelman changed the base branch from main to 24.11.x January 17, 2025 11:12
@tkelman tkelman changed the base branch from 24.11.x to 25.1.x January 17, 2025 11:12
@tkelman
Copy link
Contributor Author

tkelman commented Jan 17, 2025

pre-commit.ci autofix

@tkelman tkelman force-pushed the lief-load-command-types branch from e3b7a56 to 074df06 Compare January 30, 2025 18:34
@h-vetinari
Copy link
Contributor

backport or not, could we get this merged please? :)

lief 0.15+ may finally see the large regressions on macos we've been seeing - at least according to the release notes, which have this bullet [bold in original]:

  • Fix major performance issue when processing Mach-O binaries on Windows & macOS

@isuruf isuruf enabled auto-merge (squash) February 4, 2025 02:14
@isuruf
Copy link
Contributor

isuruf commented Feb 4, 2025

Thanks

@isuruf isuruf merged commit a330c4d into conda:25.1.x Feb 4, 2025
28 checks passed
@kenodegard kenodegard mentioned this pull request Feb 4, 2025
42 tasks
@tkelman tkelman deleted the lief-load-command-types branch February 4, 2025 06:43
bernt-matthias added a commit to bernt-matthias/conda-build that referenced this pull request Feb 21, 2025
@bernt-matthias bernt-matthias mentioned this pull request Feb 21, 2025
3 tasks
bernt-matthias added a commit to bernt-matthias/conda-build that referenced this pull request Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

More issues with lief
5 participants