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

Consolidated PR#4387 & PR#4368: Refactor Makefiles, Build Targets and fixed TAP tests linking #4395

Merged
merged 53 commits into from
Dec 22, 2023

Conversation

rahim-kanji
Copy link
Collaborator

@rahim-kanji rahim-kanji commented Dec 7, 2023

Consolidated following PRs:
PR#4387
PR#4368

This pull request addresses the following changes:

Build Target Refactoring:
If C++17 is detected, the build_*_default (formerly build_*_clickhouse) will be triggered.
For C++ standards ranging from C++11 up to, but not including, C++17, the build_*_legacy will be activated.

ClickHouse build targets are now default build targets. To maintain backward compatibility, ClickHouse build targets remain accessible.

TAP Test Fixes:
Corrected TAP test linking issues, resolving mismatch in linking OpenSSL and CURL libraries.

Enhancements in Repository Structure:

  • Relocated external TAP test dependencies (unpatched MariaDB and MySQL libraries) into the repository.
  • Improved Makefiles structure.
  • TAP tests can be compiled in release mode.

mirostauder and others added 21 commits November 26, 2023 11:08
… v2.x_testing_ci_test_failures

# Conflicts:
#	test/tap/tap/Makefile
#	test/tap/tests/Makefile
#	test/tap/tests_with_deps/deprecate_eof_support/Makefile
…failures

# Conflicts:
#	deps/Makefile
#	lib/set_parser.cpp
…se) will be initiated. If the C++ standard falls within the range of C++11 up to, but not including, C++17, the build_*_legacy will be activated.

ClickHouse targets arenow default build targets. In order to ensure backward compatibility, ClickHouse targets are still available.
…_fixes

# Conflicts:
#	test/tap/tap/Makefile
#	test/tap/tests/Makefile
@rahim-kanji rahim-kanji force-pushed the v2.x_unified_makefile_fixes branch from 8e473f9 to 282aae7 Compare December 8, 2023 11:18
@rahim-kanji rahim-kanji changed the title Unified: Makefile fixes Unified: Refactor Makefiles and Build Targets Dec 11, 2023
@rahim-kanji rahim-kanji changed the title Unified: Refactor Makefiles and Build Targets Consolidated PR#4387 & PR#4368: Refactor Makefiles, Build Targets and fixed TAP tests linking Dec 11, 2023
@rahim-kanji rahim-kanji marked this pull request as ready for review December 12, 2023 08:20
@renecannao
Copy link
Contributor

retest this please

2 similar comments
@rahim-kanji
Copy link
Collaborator Author

retest this please

@mirostauder
Copy link
Collaborator

retest this please

@renecannao renecannao merged commit c41331a into v2.x Dec 22, 2023
241 of 242 checks passed
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.

3 participants