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

p5-dbd-mysql: Fix variant conflicts issues #26725

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

jhoyt4
Copy link
Contributor

@jhoyt4 jhoyt4 commented Nov 24, 2024

Add p5.36 and p5.38 perl branches to p5-dbd-mysql dependencies:

  • p5-capture-tiny
  • p5-dbd-mysql
  • p5-dbi
  • p5-devel-checklib
  • p5-mock-config
  • p5-test-deep
  • p5-time-hires

Fix issue where multiple variant conflicts were being set as a single
conflict. Fixing this also allowed for the removal of the
active_vartiants workaround.

  • fix variant conflicts
  • remove active variants workaround
  • add mariab10_2 for legacy compatibility
  • fix typos

Closes: https://trac.macports.org/ticket/60517
Closes: https://trac.macports.org/ticket/71360
Closes: https://trac.macports.org/ticket/71381

Note - I have these broken into 2 commits to allow them to be tracked easier.

Description

Correct improper variant conflicts issue where all conflicts were handled as a single port. Additionally, attempt to address typos (at least the ones I can find) and add back the legacy mariadb10_2 variant.

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 15.1.1 24B91 arm64
Xcode 16.1 16B40

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

@jhoyt4
Copy link
Contributor Author

jhoyt4 commented Nov 24, 2024

That force push should hopefully get p5.36 and p5.38 moving as some of the necessary perl modules needed their perl branches updated to include those

@jhoyt4 jhoyt4 force-pushed the p5-dbd-mysql branch 2 times, most recently from b110238 to 9b08de3 Compare November 24, 2024 18:17
  Add p5.36 and p5.38 perl branches to:
  - p5-capture-tiny
  - p5-dbd-mysql
  - p5-dbi
  - p5-devel-checklib
  - p5-mock-config
  - p5-test-deep
  - p5-time-hires
  Fix issue where multiple variant conflicts were being set as a single
  conflict. Fixing this also allowed for the removal of the
  active_vartiants workaround.

  - fix variant conflicts
  - remove active variants workaround
  - add mariab10_2 for legacy compatibility
  - fix typos

Closes: https://trac.macports.org/ticket/60517
Closes: https://trac.macports.org/ticket/71360
Closes: https://trac.macports.org/ticket/71381
@jhoyt4 jhoyt4 marked this pull request as ready for review November 24, 2024 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants