diff --git a/.github/workflows/root-ci-config/buildconfig/debian125.txt b/.github/workflows/root-ci-config/buildconfig/debian125.txt index 8b7bc33d94a4c..311d319436fac 100644 --- a/.github/workflows/root-ci-config/buildconfig/debian125.txt +++ b/.github/workflows/root-ci-config/buildconfig/debian125.txt @@ -1,3 +1,2 @@ pythia8=OFF -mysql=OFF ccache=On diff --git a/.github/workflows/root-ci-config/buildconfig/global.txt b/.github/workflows/root-ci-config/buildconfig/global.txt index e57c87f3130b9..6bf75f677b6a7 100644 --- a/.github/workflows/root-ci-config/buildconfig/global.txt +++ b/.github/workflows/root-ci-config/buildconfig/global.txt @@ -65,10 +65,7 @@ mathmore=ON memory_termination=OFF minimal=OFF mpi=OFF -mysql=ON -odbc=OFF opengl=ON -pgsql=ON pyroot=ON pythia8=ON qt5web=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt index 0ed3ccf49fced..aa08ff1ea3417 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac-beta.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac-beta.txt @@ -24,8 +24,6 @@ builtin_zstd=ON ccache=ON cocoa=ON fortran=OFF -mysql=OFF -pgsql=OFF pythia8=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac13.txt b/.github/workflows/root-ci-config/buildconfig/mac13.txt index 150214003b1c4..0e3418cad76d5 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac13.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac13.txt @@ -24,8 +24,6 @@ builtin_zstd=ON ccache=ON cocoa=ON fortran=OFF -mysql=OFF -pgsql=OFF pythia8=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac14.txt b/.github/workflows/root-ci-config/buildconfig/mac14.txt index f3c521cbf32f5..637fc06929d21 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac14.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac14.txt @@ -24,8 +24,6 @@ builtin_zstd=ON ccache=ON cocoa=ON fortran=OFF -mysql=OFF -pgsql=OFF pythia8=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON diff --git a/.github/workflows/root-ci-config/buildconfig/mac15.txt b/.github/workflows/root-ci-config/buildconfig/mac15.txt index f3c521cbf32f5..637fc06929d21 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac15.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac15.txt @@ -24,8 +24,6 @@ builtin_zstd=ON ccache=ON cocoa=ON fortran=OFF -mysql=OFF -pgsql=OFF pythia8=OFF test_distrdf_dask=ON test_distrdf_pyspark=ON diff --git a/.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt b/.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt index 4549b7ec87ff4..b7b693c1dbcfd 100644 --- a/.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt +++ b/.github/workflows/root-ci-config/buildconfig/ubuntu2404-cuda.txt @@ -9,7 +9,6 @@ tmva-cudnn=ON tmva-pymva=ON fortran=OFF gdml=OFF -mysql=OFF spectrum=OFF sqlite=OFF test_distrdf_dask=OFF diff --git a/.github/workflows/root-ci-config/buildconfig/windows10.txt b/.github/workflows/root-ci-config/buildconfig/windows10.txt index 0ae55c3ea810f..7572924f386bc 100644 --- a/.github/workflows/root-ci-config/buildconfig/windows10.txt +++ b/.github/workflows/root-ci-config/buildconfig/windows10.txt @@ -16,9 +16,6 @@ davix=OFF llvm13_broken_tests=OFF minuit2_mpi=OFF minuit2_omp=OFF -mysql=OFF -odbc=ON -pgsql=OFF pyroot2=OFF pyroot3=ON pythia8=OFF diff --git a/README/ReleaseNotes/v636/index.md b/README/ReleaseNotes/v636/index.md index 2932bbadb68a9..3d66035eec3a1 100644 --- a/README/ReleaseNotes/v636/index.md +++ b/README/ReleaseNotes/v636/index.md @@ -37,6 +37,7 @@ The following people have contributed to this new version: * The `RooDataSet` constructors to construct a dataset from a part of an existing dataset are deprecated and will be removed in ROOT 6.38. This is to avoid interface duplication. Please use `RooAbsData::reduce()` instead, or if you need to change the weight column, use the universal constructor with the `Import()`, `Cut()`, and `WeightVar()` arguments. * The ROOT splash screen was removed for Linux and macOS * Proof support has been completely removed form RooFit and RooStats, after it was already not working anymore for several releases +* The build options `mysql`, `odbc`, and `pgsql` have been deprecated. Please complain with root-dev@cern.ch should you still need one! ## Python Interface diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake index 3d5625e81d115..360b692aebc30 100644 --- a/cmake/modules/RootBuildOptions.cmake +++ b/cmake/modules/RootBuildOptions.cmake @@ -142,10 +142,10 @@ ROOT_BUILD_OPTION(memory_termination OFF "Free internal ROOT memory before proce ROOT_BUILD_OPTION(minuit2_mpi OFF "Enable support for MPI in Minuit2") ROOT_BUILD_OPTION(minuit2_omp OFF "Enable support for OpenMP in Minuit2") ROOT_BUILD_OPTION(mpi OFF "Enable support for Message Passing Interface (MPI)") -ROOT_BUILD_OPTION(mysql ON "Enable support for MySQL databases") -ROOT_BUILD_OPTION(odbc OFF "Enable support for ODBC databases (requires libiodbc or libodbc)") +ROOT_BUILD_OPTION(mysql OFF "Enable support for MySQL databases (deprecated)") +ROOT_BUILD_OPTION(odbc OFF "Enable support for ODBC databases (requires libiodbc or libodbc; deprecated)") ROOT_BUILD_OPTION(opengl ON "Enable support for OpenGL (requires libGL and libGLU)") -ROOT_BUILD_OPTION(pgsql ON "Enable support for PostgreSQL") +ROOT_BUILD_OPTION(pgsql OFF "Enable support for PostgreSQL (deprecated)") ROOT_BUILD_OPTION(proof OFF "Enable support for PROOF") ROOT_BUILD_OPTION(pyroot ON "Enable support for automatic Python bindings (PyROOT)") ROOT_BUILD_OPTION(pythia8 OFF "Enable support for Pythia 8.x [GPL]") @@ -232,10 +232,7 @@ if(all) set(fcgi_defvalue ON) set(imt_defvalue ON) set(mathmore_defvalue ON) - set(mysql_defvalue ON) - set(odbc_defvalue ON) set(opengl_defvalue ON) - set(pgsql_defvalue ON) set(proof_defvalue OFF) set(pythia8_defvalue ON) set(pyroot_defvalue ON) @@ -401,7 +398,7 @@ foreach(opt afdsmgrd afs alien bonjour builtin_afterimage castor chirp cxx11 cxx endforeach() #---Deprecated options------------------------------------------------------------------------ -foreach(opt html) +foreach(opt html mysql odbc pgsql) if(${opt}) message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.") endif()