Skip to content

Basic OpenBSD support. #3572

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

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Basic OpenBSD support. #3572

merged 1 commit into from
Jun 28, 2021

Conversation

3405691582
Copy link
Member

@3405691582 3405691582 commented Jun 23, 2021

Pepper in the right conditionals throughout.

The unversioned triple issue is still necessary for the bootstrap script
(and only the bootstrap script) which we will deal with separately.

Motivation:

Permit SPM to build on this platform.

Modifications:

  • Sources/Basics/DispatchTimeInterval+Extensions.swift: add the platform to the #if to make the extension available
  • Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift: add the platform to the switch -- likely not required to build but we might as well extend this now we are enabling the platform.
  • Sources/PackageDescription/SupportedPlatforms.swift: add the static var for the platform. Please let me know here if the 5.4 availability annotation needs revision here.
  • Sources/PackageLoading/PlatformRegistry.swift: add to the known platform list.
  • Sources/PackageModel/Platform.swift: add the static var for the platform.
  • Sources/SPMBuildCore/BinaryTarget+Extensions.swift: indeed XCFrameworks is unsupported
  • Sources/SPMBuildCore/BuildParameters.swift: add the case for BuildParameters currentPlatform.
  • Utilities/bootstrap: required flags for a successful build since sqlite3 is not part of the base system, additional flags are required (but again, the unversioned triple problem remains).
  • Tests/PackageCollectionsTests/Utility.swift and Tests/PackageLoadingTests/PackageBuilderTests.swift modified to match.

Result:

  • SPM handles the new cases being introduced in TSC.
  • SPM can build on OpenBSD.

Copy link
Contributor

@neonichu neonichu left a comment

Choose a reason for hiding this comment

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

LGTM, except for updating the introduced version of the manifest API change as commented.

@3405691582 3405691582 force-pushed the OpenBSDSupport branch 2 times, most recently from 7bb860b to 60ce8aa Compare June 23, 2021 19:41
@3405691582
Copy link
Member Author

Set to 999.0.

@neonichu
Copy link
Contributor

@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented Jun 23, 2021

swiftlang/swift-tools-support-core#228
@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented Jun 24, 2021

swiftlang/swift-tools-support-core#228
@swift-ci please smoke test

Pepper in the right conditionals throughout.

The unversioned triple issue is still necessary for the bootstrap script
(and only the bootstrap script) which we will deal with separately.
@3405691582
Copy link
Member Author

3405691582 commented Jun 24, 2021

Fixed the last broken test case. That should hopefully be all that's required. 🤞 I'm rerunning them locally but that takes some time.

The other test run looks like it's not integrating the changes across projects, though?

@tomerd
Copy link
Contributor

tomerd commented Jun 24, 2021

swiftlang/swift-tools-support-core#228
@swift-ci please smoke test

@neonichu
Copy link
Contributor

The other test run looks like it's not integrating the changes across projects, though?

The self hosted jobs don't support cross-repo testing, but they aren't required to pass anyway. They mostly exist to get quick response from CI since the actual smoke tests can take a long time.

@tomerd
Copy link
Contributor

tomerd commented Jun 25, 2021

@neonichu since smoke tests pass - can this and swiftlang/swift-tools-support-core#228 be merged? the cross-PR testing on the TSC side did not pass / work

@neonichu
Copy link
Contributor

Yep, I think this can be merged. But I'd like to take a look at what exactly failed when doing a cross-repo test from the TSC side.

@neonichu
Copy link
Contributor

TSC PR is merged now, so we can merge this as well.

@neonichu neonichu merged commit 5e4695d into swiftlang:main Jun 28, 2021
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.

4 participants