Fix build on macOS with newer P4 SDK versions by linking with the p4s…

salesforce / p4-fusion

A fast Perforce to Git conversion tool written in C++ using Perforce Helix Core C++ API and Libgit2

BSD 3-Clause "New" or "Revised" License

78 stars 17 forks source link

Fix build on macOS with newer P4 SDK versions by linking with the p4s… #79

Closed peter-esik closed 3 months ago

peter-esik commented 3 months ago

…cript_cstub library, for #78

The p4client library seems to have unconditional references to the P4Script machinery, even if that feature is not used by the application (in this case, p4-fusion). This causes linking errors (undefined references to sqlite, and curl functions)
The p4script_cstub library seems to be an official solution for this situation, as it contains stubs (dummy, empty implementations) of all relevant functions

peter-esik commented 3 months ago

Looks like the library p4script_cstub was introduced in version 2023.1, while the CI is using 2021.1. I tried to update the build.yaml file, but looks like I lack the necessary permission, so I'm not able to push the changes.

-        wget https://www.perforce.com/downloads/perforce/r21.1/bin.linux26x86_64/p4api.tgz
-        tar -C vendor/helix-core-api/linux -xzf p4api.tgz --strip 1
+        wget https://www.perforce.com/downloads/perforce/r24.1/bin.linux26x86_64/p4api-glibc2.12-openssl1.1.1.tgz
+        tar -C vendor/helix-core-api/linux -xzf p4api-glibc2.12-openssl1.1.1.tgz --strip 1

Could you help me out here @twarit-waikar ?

twarit-waikar commented 3 months ago

I tried to update the build.yaml file, but looks like I lack the necessary permission, so I'm not able to push the changes.

What do you see when you try to push this change? Is there a notice saying you can't change files in this directory? If yes, it's certainly not intended.

peter-esik commented 3 months ago

What do you see when you try to push this change? Is there a notice saying you can't change files in this directory? If yes, it's certainly not intended.

I managed to sort this out. I'm using GitHub Desktop, and all I had to do back then was to sign in with my account to get going. Looks like whatever the GitHub Desktop application is using for authorization does not include the ability to modify workflow files.

I've worked around this by creating a Personal Access Token with the workflow scope included, that way I was able to push my changes from the command line. Sorry for bothering you with this!

Now I seem to face a "spurious build error". My guess is that by bumping the openssl version used, there is now an openssl-src folder with mixed content both from the previous and new versions extracted, due to caching.

@twarit-waikar could you please delete the cache? This requires write access to the repository. I hope this will get rid of the build error 🤞

twarit-waikar commented 3 months ago

@peter-esik I didn't actually see any caches in the link you sent up there ^. I have retriggered the builds for this PR meanwhile.

twarit-waikar commented 3 months ago

All check passed! I will merge this in. Thanks!

twarit-waikar commented 3 months ago

@peter-esik Ah I didn't see this was a draft PR, I will let you decide when it is ready for merging

peter-esik commented 3 months ago

Whoops, I accidentally created this as a draft. Feel free to merge!