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

mysql: use llvm on Ventura #206095

Merged
merged 2 commits into from
Feb 1, 2025
Merged

mysql: use llvm on Ventura #206095

merged 2 commits into from
Feb 1, 2025

Conversation

cho-m
Copy link
Member

@cho-m cho-m commented Jan 31, 2025

  • Have you followed the guidelines for contributing?
  • Have you ensured that your commits follow the commit style guide?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with HOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing HOMEBREW_NO_INSTALL_FROM_API=1 brew install --build-from-source <formula>)? If this is a new formula, does it pass brew audit --new <formula>?

@github-actions github-actions bot added the icu4c ICU use is a significant feature of the PR or issue label Jan 31, 2025
@cho-m
Copy link
Member Author

cho-m commented Jan 31, 2025

Probably going to have to bring back HOMEBREW_LIBRARY_PATHS workaround (to inject path earlier)

Or keep CC/CXX workaround as MySQL 9.2.0 automatically injects paths when HOMEBREW_PREFIX/{Cellar,opt} is detected https://github.com/mysql/mysql-server/blob/mysql-cluster-9.2.0/CMakeLists.txt#L1745-L1761

  IF(CMAKE_CXX_COMPILER MATCHES "/opt/homebrew/Cellar" OR
      CMAKE_CXX_COMPILER MATCHES ${HOMEBREW_HOME}
      )
    SET(CMAKE_AR ${CMAKE_CXX_COMPILER_AR})
    SET(CMAKE_RANLIB ${CMAKE_CXX_COMPILER_RANLIB})
    GET_FILENAME_COMPONENT(CXX_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
    GET_FILENAME_COMPONENT(LLVM_DIR ${CXX_DIR} DIRECTORY)
    SET(LLVMBUNDLE_LINKER_FLAGS " -L${LLVM_DIR}/lib/c++")
    IF(EXISTS ${LLVM_DIR}/lib/unwind/libunwind.dylib)
      STRING_APPEND(LLVMBUNDLE_LINKER_FLAGS " -L${LLVM_DIR}/lib/unwind -lunwind")
    ELSEIF(EXISTS "${LLVM_DIR}/lib/libunwind.dylib")
      STRING_APPEND(LLVMBUNDLE_LINKER_FLAGS " -L${LLVM_DIR}/lib -lunwind")
    ENDIF()
    STRING_APPEND(CMAKE_EXE_LINKER_FLAGS "${LLVMBUNDLE_LINKER_FLAGS}")
    STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS "${LLVMBUNDLE_LINKER_FLAGS}")
    STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS "${LLVMBUNDLE_LINKER_FLAGS}")
  ENDIF()

@cho-m cho-m added the CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. label Jan 31, 2025
@cho-m cho-m marked this pull request as ready for review January 31, 2025 23:32
@cho-m cho-m added homepage ready to merge PR can be merged once CI is green labels Feb 1, 2025
Copy link
Contributor

github-actions bot commented Feb 1, 2025

🤖 An automated task has requested bottles to be published to this PR.

@github-actions github-actions bot added the CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. label Feb 1, 2025
@BrewTestBot BrewTestBot enabled auto-merge February 1, 2025 08:21
@BrewTestBot BrewTestBot added this pull request to the merge queue Feb 1, 2025
Merged via the queue into master with commit 91fc1c6 Feb 1, 2025
15 checks passed
@BrewTestBot BrewTestBot deleted the mysql-llvm branch February 1, 2025 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-no-fail-fast Continue CI tests despite failing GitHub Actions matrix builds. CI-published-bottle-commits The commits for the built bottles have been pushed to the PR branch. homepage icu4c ICU use is a significant feature of the PR or issue ready to merge PR can be merged once CI is green
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants