Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libffi: Add 3.4.6, remove 3.4.2 and 3.4.3 #23362

Merged
merged 12 commits into from
May 28, 2024

Conversation

Ahajha
Copy link
Contributor

@Ahajha Ahajha commented Apr 4, 2024

Specify library name and version: libffi/3.4.6

The patch 0007-3.4.3-forward-declare-open_temp_exec_file.patch (and friends) is no longer needed for the new version, as it has been upstreamed.

The MSVC build changed slightly: libffi/libffi@2b2f61f, essentially there's a new FFI_STATIC_BUILD that replaces FFI_BUILDING.

I'm not certain that the FFI_BUILDING/FFI_STATIC_BUILD macros need to be in the package info for non-MSVC builds. I've kept them for now, but maybe we could revisit at some point.

Older versions of libffi don't support Apple ARM CPUs, it looks like there was an attempt to backport the fix, but the patch itself wasn't actually merged: #5085. There are plenty of newer versions so I don't think it's worth fixing at this point. Unsure why this was still an issue.


Copy link
Contributor

github-actions bot commented Apr 4, 2024

🤖 Beep Boop! This pull request is making changes to 'recipes/libffi//'.

👋 @Hopobcn you might be interested. 😉

@ericLemanissierBot
Copy link

I detected other pull requests that are modifying libffi/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

@Ahajha
Copy link
Contributor Author

Ahajha commented Apr 4, 2024

@uilianries @RubenRBS Do you think it's about time to remove pre-3.4.4 versions? 3.4.4 is used everywhere (except llvm-core which is still on 3.3, but is being updated in #22997), and is already about two years old, I don't think we need anything older.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

RubenRBS
RubenRBS previously approved these changes Apr 8, 2024
Copy link
Member

@RubenRBS RubenRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for the detailed PR body, it's super appreciated :)

@Ahajha
Copy link
Contributor Author

Ahajha commented Apr 8, 2024

@RubenRBS What do you think about removing the older versions? Only 3.3 is used, and it's by llvm-core, which is getting updated in another PR. 3.4.4 itself has been out for nearly 2 years, I don't think we need anything older.

@uilianries
Copy link
Member

@Ahajha you could remove 3.4.3 and 3.4.2. Others I would prefer in another PR, after updating other recipes first. Thank you for checking it.

@Ahajha Ahajha changed the title libffi: Add 3.4.6 libffi: Add 3.4.6, remove 3.4.2 and 3.4.3 Apr 9, 2024
@Ahajha
Copy link
Contributor Author

Ahajha commented Apr 9, 2024

@uilianries I've removed those two versions. I realize my comment wasn't clear, 3.4.4 I think should stay for now (and would have to anyways), 3.3 was the other version that I think should be removed, but I'll wait until the llvm-core PR is merged to do that.

@conan-center-bot

This comment has been minimized.

@uilianries
Copy link
Member

uilianries commented Apr 9, 2024

@Ahajha You need to remove both version from conandata.yml too.

UPDATE: Fixed by dab998a

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 10 (dab998a7d982a10fa9dbc16cf8d27d52003fbfa4):

  • libffi/3.4.6:
    All packages built successfully! (All logs)

  • libffi/3.3:
    All packages built successfully! (All logs)

  • libffi/3.4.4:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 10 (dab998a7d982a10fa9dbc16cf8d27d52003fbfa4):

  • libffi/3.4.6:
    All packages built successfully! (All logs)

  • libffi/3.4.4:
    All packages built successfully! (All logs)

  • libffi/3.3:
    All packages built successfully! (All logs)

@Ahajha
Copy link
Contributor Author

Ahajha commented Apr 9, 2024

@uilianries Thanks, was a bit tired last night :)

@uilianries
Copy link
Member

@uilianries Thanks, was a bit tired last night :)

Thank you for contributing!!!! 👏

Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

"3.3":
url: "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"
sha256: "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"
patches:
"3.4.6":
- patch_file: "patches/0002-3.4.6-fix-libtool-path.patch"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please start adding patch_description and patch_type. Additionally patch_source if applicable

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were from existing patches, but I can do some digging and figure out their purposes.

@conan-center-bot conan-center-bot merged commit 3286aeb into conan-io:master May 28, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants