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.

Sign up for GitHub

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

Jump to bottom

libffi: Support Conan V2 #13355

Merged
merged 47 commits into from
Oct 24, 2022
Merged

libffi: Support Conan V2 #13355

merged 47 commits into from
Oct 24, 2022

Commits on Oct 7, 2022

  1. Added Conan v2 support 

    Based on this template:
https://github.com/conan-io/conan-center-index/tree/master/docs/package_templates/autotools_package

Contribute to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    b6a5f2c View commit details
    Browse the repository at this point in the history

  2. catch ValueError instead of broad Exception catch 

    Contributes to CURA-9628
    @jwillikers
    j.spijker@ultimaker.com authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    c468c84 View commit details
    Browse the repository at this point in the history

  3. Validating not needed in this recipe 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    d19abd5 View commit details
    Browse the repository at this point in the history

  4. Clean-up various path references 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    8077e01 View commit details
    Browse the repository at this point in the history

  5. Use modern apple rpath fix 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    d945949 View commit details
    Browse the repository at this point in the history

  6. Reapplied patches again 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    02d6ace View commit details
    Browse the repository at this point in the history

  7. convert Path to str before passing to unix_path 

    Contributes to CURA-9628
    @jwillikers
    j.spijker@ultimaker.com authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    35126ea View commit details
    Browse the repository at this point in the history

  8. Removed clang exception in generate 

    Contributes to CURA-9628
    @jwillikers
    j.spijker@ultimaker.com authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    3188330 View commit details
    Browse the repository at this point in the history

  9. Use user_info.ar_lib as a workaround 

    Should be reverted once conan-io#12898
has been merged

Contribute to CURA-9628 and CURA-9575
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    5021f70 View commit details
    Browse the repository at this point in the history

  10. disable multi os directory when compiling with apple-clang 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    98a8c71 View commit details
    Browse the repository at this point in the history

  11. Use conf for AR variable 

    Contributes to CURA-9628
    @jellespijker @jwillikers
    jellespijker authored and jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    d56e09d View commit details
    Browse the repository at this point in the history

  12. Slight clean up

    @jwillikers
    jwillikers committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    09263f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2022

  1. Evaluate ar-lib path

    @jwillikers
    jwillikers committed Oct 9, 2022
    Configuration menu
    Copy the full SHA
    1658a0c View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2022

  1. Update recipes/libffi/all/conanfile.py 

    Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
    @jwillikers @SpaceIm
    jwillikers and SpaceIm authored Oct 12, 2022
    Configuration menu
    Copy the full SHA
    ba3cdaa View commit details
    Browse the repository at this point in the history

  2. Move DLL's to the bin directory

    @jwillikers
    jwillikers committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    f2aaf08 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. Rename source folder to src

    @jwillikers
    jwillikers committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    4d75e3d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Small fixes

    @jwillikers
    jwillikers committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    7cf5dfe View commit details
    Browse the repository at this point in the history

  2. Fix renaming DLL's

    @jwillikers
    jwillikers committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    5a3ba19 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Make bin directory

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    9e9d327 View commit details
    Browse the repository at this point in the history

  2. Be sure to set DISABLE_FFI_CALL properly

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    adf40f0 View commit details
    Browse the repository at this point in the history

  3. Remove stuff AutotoolsToolchain should set

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    1c0ffea View commit details
    Browse the repository at this point in the history

  4. Clean up compiler wrapper

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    aa9ccad View commit details
    Browse the repository at this point in the history

  5. Move VirtualBuildEnv before MSVC settings

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    f2f714b View commit details
    Browse the repository at this point in the history

  6. Add missing generate method for toolchain

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    af1d8f7 View commit details
    Browse the repository at this point in the history

  7. Use provided compile wrapper and add missing defines

    @jwillikers
    jwillikers committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    32287b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Set build and host

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    d2fbc94 View commit details
    Browse the repository at this point in the history

  2. Add architecture flags

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    d9af364 View commit details
    Browse the repository at this point in the history

  3. Pass architecture flag to compiler wrapper

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    6296b00 View commit details
    Browse the repository at this point in the history

  4. Fix for Clang on Windows

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    cc2cd14 View commit details
    Browse the repository at this point in the history

  5. Use gnu-config

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    79d2f4e View commit details
    Browse the repository at this point in the history

  6. Fix copy-paste

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    f9b541c View commit details
    Browse the repository at this point in the history

  7. Use cygwin triplet

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    0ef94c6 View commit details
    Browse the repository at this point in the history

  8. Use the VCVars generator

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    1ce5ba9 View commit details
    Browse the repository at this point in the history

  9. Revert "Use cygwin triplet" 

    This reverts commit 0ef94c6.
    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    a2a7b9e View commit details
    Browse the repository at this point in the history

  10. Revert "Use gnu-config" 

    This reverts commit 79d2f4e.
    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    cfe1755 View commit details
    Browse the repository at this point in the history

  11. Fix wrapper

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    617b205 View commit details
    Browse the repository at this point in the history

  12. Define the assembler in the wrapper script

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    c6e32dd View commit details
    Browse the repository at this point in the history

  13. Remove VCVars

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    6b14397 View commit details
    Browse the repository at this point in the history

  14. Use the toolchain's environment

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    6b5b62c View commit details
    Browse the repository at this point in the history

  15. Fix Windows to use wrapper script

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    b992e6f View commit details
    Browse the repository at this point in the history

  16. Align with updated autotools template

    @jwillikers
    jwillikers committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    5ef89bb View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Always define FFI_BUILDING

    @jwillikers
    jwillikers committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    7c2e389 View commit details
    Browse the repository at this point in the history

  2. Don't define FFI_DEBUG

    @jwillikers
    jwillikers committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    4abd072 View commit details
    Browse the repository at this point in the history

  3. Try patching version 3.2.1

    @jwillikers
    jwillikers committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    f15d3e4 View commit details
    Browse the repository at this point in the history

  4. Revert "Try patching version 3.2.1" 

    This reverts commit f15d3e4.
    @jwillikers
    jwillikers committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    33dd7ee View commit details
    Browse the repository at this point in the history

  5. Drop version 3.2.1 

    This is no longer building and I don't know why.
It's also from 2014, so hopefully it's okay to drop.
    @jwillikers
    jwillikers committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    828566a View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Clean up

    @jwillikers
    jwillikers committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    9eb2683 View commit details
    Browse the repository at this point in the history