diff --git a/fragments/packages/LCG_97-x86_64-centos7-clang8-dbg.cmake b/fragments/packages/LCG_97-x86_64-centos7-clang8-dbg.cmake
index c46f2905e4122a3aa1d5162978729f1aa9525278..c55e0ceb228c63f54e2c1efa7c05076d5b7a6524 100644
--- a/fragments/packages/LCG_97-x86_64-centos7-clang8-dbg.cmake
+++ b/fragments/packages/LCG_97-x86_64-centos7-clang8-dbg.cmake
@@ -82,7 +82,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-clang8-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-clang8-dbg")
@@ -485,6 +485,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-e9f7e/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-b2bba/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-b1c11/x86_64-centos7-clang8-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97-x86_64-centos7-clang8-opt.cmake b/fragments/packages/LCG_97-x86_64-centos7-clang8-opt.cmake
index 00d54bfd633cc092a90f9f5929212b5f1fb4ab54..909bcc26591ebaaf30add72d72d5b711c039294b 100644
--- a/fragments/packages/LCG_97-x86_64-centos7-clang8-opt.cmake
+++ b/fragments/packages/LCG_97-x86_64-centos7-clang8-opt.cmake
@@ -82,7 +82,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-clang8-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-clang8-opt")
@@ -485,6 +485,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-e9f7e/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-b2bba/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-b1c11/x86_64-centos7-clang8-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-clang8-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97-x86_64-centos7-gcc9-dbg.cmake b/fragments/packages/LCG_97-x86_64-centos7-gcc9-dbg.cmake
index 033446539342f736bdf2392349484ddb638f369e..e57bc75397353010f6dec08f7bcd0f4cee6b5092 100644
--- a/fragments/packages/LCG_97-x86_64-centos7-gcc9-dbg.cmake
+++ b/fragments/packages/LCG_97-x86_64-centos7-gcc9-dbg.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-gcc9-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-gcc9-dbg")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ebe4e/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-10e75/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1dc23/x86_64-centos7-gcc9-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97-x86_64-centos7-gcc9-opt.cmake b/fragments/packages/LCG_97-x86_64-centos7-gcc9-opt.cmake
index 1a3c02eb423bb56664e43453908fb83457177154..fa46774bcae8441af7c96107e5dba3f6e72c8e95 100644
--- a/fragments/packages/LCG_97-x86_64-centos7-gcc9-opt.cmake
+++ b/fragments/packages/LCG_97-x86_64-centos7-gcc9-opt.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-gcc9-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-gcc9-opt")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ebe4e/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-10e75/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1dc23/x86_64-centos7-gcc9-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-dbg.cmake b/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-dbg.cmake
index 4de2b60fbc99c741097e4a8034c09cc24086b61b..a05e1f670f4e99f72161e9e29eadf08ad4a178b5 100644
--- a/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-dbg.cmake
+++ b/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-dbg.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-gcc9-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-gcc9-dbg")
@@ -487,6 +487,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-10e75/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1dc23/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/MCGenerators/herwig++/2.7.1-a6cf0/x86_64-centos7-gcc9-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-opt.cmake b/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-opt.cmake
index b4489c88eba9a728cb705557459db3b668e7b081..83afa180a7b5a073685735f0422384a09664474e 100644
--- a/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-opt.cmake
+++ b/fragments/packages/LCG_97_LHCB_1-x86_64-centos7-gcc9-opt.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-16876/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-a84b0/x86_64-centos7-gcc9-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-5c584/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-ec9d4/x86_64-centos7-gcc9-opt")
@@ -487,6 +487,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-b82f2/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.02-10e75/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1dc23/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/MCGenerators/herwig++/2.7.1-a6cf0/x86_64-centos7-gcc9-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-dbace/x86_64-centos7-gcc9-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-clang10-dbg.cmake b/fragments/packages/LCG_97a-x86_64-centos7-clang10-dbg.cmake
index 3c151882b7f89a5470667983281b8dd2f8e76ab6..de8db5671c3da242a88969522bdd91e145504dbd 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-clang10-dbg.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-clang10-dbg.cmake
@@ -83,7 +83,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-clang10-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-clang10-dbg")
@@ -483,6 +483,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ac8ee/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-12dd1/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-707b4/x86_64-centos7-clang10-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-clang10-opt.cmake b/fragments/packages/LCG_97a-x86_64-centos7-clang10-opt.cmake
index 1a3deee7dfbf99654b1c24d4257c8698dd89deaf..cd0ee658480e72804a70c841584dea880bf0271b 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-clang10-opt.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-clang10-opt.cmake
@@ -83,7 +83,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-clang10-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-clang10-opt")
@@ -483,6 +483,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ac8ee/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-12dd1/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-707b4/x86_64-centos7-clang10-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang10-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-clang8-dbg.cmake b/fragments/packages/LCG_97a-x86_64-centos7-clang8-dbg.cmake
index f41819e54779076f4f2ffa3a6bd049299ae66623..7f051193b42574aa2ca53c258c2f68542b77adb0 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-clang8-dbg.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-clang8-dbg.cmake
@@ -83,7 +83,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-clang8-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-clang8-dbg")
@@ -483,6 +483,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ac8ee/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-12dd1/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-707b4/x86_64-centos7-clang8-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-clang8-opt.cmake b/fragments/packages/LCG_97a-x86_64-centos7-clang8-opt.cmake
index 95b612660b67142557a6fd8f3f4330a0a8b90f60..5ab9cd71f761778c9205f5c298348df9d8070aa6 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-clang8-opt.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-clang8-opt.cmake
@@ -83,7 +83,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-clang8-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-clang8-opt")
@@ -483,6 +483,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-ac8ee/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-12dd1/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-707b4/x86_64-centos7-clang8-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-clang8-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-gcc9-dbg.cmake b/fragments/packages/LCG_97a-x86_64-centos7-gcc9-dbg.cmake
index b4650725445bf2309e4d82a1918addb6d832ce8d..52658ee43795a3c09fb5b860c71421e0b6d4e7e7 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-gcc9-dbg.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-gcc9-dbg.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-gcc9-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-gcc9-dbg")
@@ -487,6 +487,7 @@ _add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-3f7fd/x86_64-centos7-gcc9-dbg
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-4d79d/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/DD4hep/v01-14-4-gf4343fc-a0220/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/GitCondDB/0.2.0-84165/x86_64-centos7-gcc9-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97a-x86_64-centos7-gcc9-opt.cmake b/fragments/packages/LCG_97a-x86_64-centos7-gcc9-opt.cmake
index 52307fc81e490d5bb1a2b711bd55b1d0dc74c2e7..c86d03226867f585ad5e0a7685e26574246faab0 100644
--- a/fragments/packages/LCG_97a-x86_64-centos7-gcc9-opt.cmake
+++ b/fragments/packages/LCG_97a-x86_64-centos7-gcc9-opt.cmake
@@ -84,7 +84,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-d6254/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-af4e8/x86_64-centos7-gcc9-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-f6490/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-4d18b/x86_64-centos7-gcc9-opt")
@@ -487,6 +487,7 @@ _add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-3f7fd/x86_64-centos7-gcc9-opt
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.2-4d79d/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/DD4hep/v01-14-4-gf4343fc-a0220/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/GitCondDB/0.2.0-84165/x86_64-centos7-gcc9-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-e51e5/x86_64-centos7-gcc9-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-dbg.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-dbg.cmake
index 0855b9cd8884749c13711fcfaad67dbc0f86ae93..f018222ffe57774d7cc82d151b2982f607f1495e 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-dbg.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-dbg.cmake
@@ -88,7 +88,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-clang10-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-clang10-dbg")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-335b8/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-2a0d0/x86_64-centos7-clang10-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1aec1/x86_64-centos7-clang10-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-opt.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-opt.cmake
index a52b92732ed49fa41dbba1b83270b3eb490fdd63..d73f6faa30c057208949df4ea5a97644ca0853f5 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-opt.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-clang10-opt.cmake
@@ -88,7 +88,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-clang10-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-clang10-opt")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-335b8/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-2a0d0/x86_64-centos7-clang10-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1aec1/x86_64-centos7-clang10-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang10-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-dbg.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-dbg.cmake
index 45b3ff878aabe28304b145c217d66b863f9e71d8..cf365cb5198f0a0c7663e6b88be0d532d3090a0c 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-dbg.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-dbg.cmake
@@ -88,7 +88,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-clang8-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-clang8-dbg")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-335b8/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-2a0d0/x86_64-centos7-clang8-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1aec1/x86_64-centos7-clang8-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-opt.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-opt.cmake
index 23cf9f197035c0a3faaeef7e8645473cff009287..cbdf1143c2dd4d27cfa6ad749c6e840c8df55507 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-opt.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-clang8-opt.cmake
@@ -88,7 +88,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-clang8-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-clang8-opt")
@@ -488,6 +488,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-335b8/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-2a0d0/x86_64-centos7-clang8-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-1aec1/x86_64-centos7-clang8-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-clang8-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-dbg.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-dbg.cmake
index 285328e63ec4324054afcc07d91785311ab9698c..7919b30d2949982b36b5a2219189c569a14730e7 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-dbg.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-dbg.cmake
@@ -89,7 +89,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-gcc9-dbg")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-dbg/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-gcc9-dbg")
@@ -490,6 +490,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-76879/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-9e6ed/x86_64-centos7-gcc9-dbg")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-7c798/x86_64-centos7-gcc9-dbg")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-dbg/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-opt.cmake b/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-opt.cmake
index 4f24ba4f328956b55664cdf61d0c0aa7336759d0..57aee9d116c84575473e73c729487bd5c7780101 100644
--- a/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-opt.cmake
+++ b/fragments/packages/LCG_97apython3-x86_64-centos7-gcc9-opt.cmake
@@ -89,7 +89,7 @@ _add_lcg_entry("${LCG_releases_base}/C50/2.07-1cf8b/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cachetools/3.1.1-89caf/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cairo/1.17.2-724fa/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cartopy/0.17.0-998dd/x86_64-centos7-gcc9-opt")
-_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-opt/catboost")
+_add_lcg_entry("${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ccache/3.7.1-7651f/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/certifi/2019.3.9-49186/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/cffi/1.12.2-8e0bd/x86_64-centos7-gcc9-opt")
@@ -490,6 +490,7 @@ _add_lcg_entry("${LCG_releases_base}/MCGenerators/recola/2.2.0-df42e/x86_64-cent
_add_lcg_entry("${LCG_releases_base}/MCGenerators/thep8i/2.0.0-76879/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/ROOT/v6.20.06-9e6ed/x86_64-centos7-gcc9-opt")
_add_lcg_entry("${LCG_releases_base}/hepmc3/3.2.1-7c798/x86_64-centos7-gcc9-opt")
+list(PREPEND ld_library_path "${LCG_releases_base}/catboost/0.9.1.1-c576c/x86_64-centos7-gcc9-opt/catboost/libs/model_interface")
_add_lbenv_workspace(${LHCB_PLATFORM})
_update_env()
_fix_pkgconfig_search()
diff --git a/utils/new_lcg_version.py b/utils/new_lcg_version.py
index d9b6465538fa9fe6c1f2eb4c3fc7c863b1a607f4..e4db46af356868fe722da4ccc67cdc31af0d02fd 100755
--- a/utils/new_lcg_version.py
+++ b/utils/new_lcg_version.py
@@ -19,6 +19,7 @@ import logging
from subprocess import check_call
LCG_META_INFO_ROOT = "https://lcgpackages.web.cern.ch/lcgpackages/lcg/meta/"
+IGNORED_LCG_PACKAGES = {"cmake", "gaudi", "geant4", "git", "hepmc3", "ninja", "xenv"}
def parse_lcg_info_line(line):
@@ -117,7 +118,7 @@ def _header():
return HEADER_TEMPLATE.format(year=date.today().year)
-def _entry_point(version, platform):
+def _entry_point(version, platform, lcg_base):
if "=" in platform:
platform, lcg_platform = platform.split("=", 1)
architecture = platform.split("-")[0]
@@ -125,7 +126,9 @@ def _entry_point(version, platform):
architecture=architecture, lcg_platform=lcg_platform, platform=platform
)
else:
- return TOOLCHAIN_ENTRY_POINT.format(version=version, platform=platform)
+ return TOOLCHAIN_ENTRY_POINT.format(
+ version=version, platform=platform, lcg_base=lcg_base
+ )
def _compiler(system, compiler):
@@ -153,15 +156,30 @@ def _packages(lcg_info):
lcg_dirs = {
name: LCG_PACKAGE_PATH.format(**info)
for name, info in lcg_info["packages"].items()
- if name.lower() not in ("cmake", "gaudi", "geant4", "git", "hepmc3", "ninja")
+ if name.lower() not in IGNORED_LCG_PACKAGES
}
- # catboost is installed differently from any other package
- if "catboost" in lcg_dirs:
- lcg_dirs["catboost"] += "/catboost"
data.extend('_add_lcg_entry("{}")'.format(d) for d in lcg_dirs.values())
+ # catboost is installed differently from any other package
+ if "catboost" in lcg_dirs:
+ data.append(
+ 'list(PREPEND ld_library_path "{}/catboost/libs/model_interface")'.format(
+ lcg_dirs["catboost"]
+ )
+ )
data.append("_add_lbenv_workspace(${LHCB_PLATFORM})")
data.append("_update_env()")
+ # as of LCG 99 (libgit2 1.0.1) we need to help pkg-config to find libgit2
+ # because it is installed in lib64 istead of lib (and CMake cross compilation
+ # ignores lib64 dirs)
+ if "libgit2" in lcg_dirs:
+ data.append(
+ (
+ "if(EXISTS {root}/lib64/pkgconfig)\n"
+ ' set(ENV{{PKG_CONFIG_PATH}} "{root}/lib64/pkgconfig:$ENV{{PKG_CONFIG_PATH}}")\n'
+ "endif()"
+ ).format(root=lcg_dirs["libgit2"])
+ )
data.append("_fix_pkgconfig_search()")
if "Python" in lcg_dirs:
data.append('_set_pythonhome("{}")'.format(lcg_dirs["Python"]))
@@ -191,6 +209,11 @@ def main():
parser.add_argument("version", help="version of LCG to generate")
parser.add_argument("platform", nargs="+", help="platforms to generate")
parser.add_argument("--no-git", action="store_true", help="do not commit to git")
+ parser.add_argument(
+ "--lcg-base",
+ default="/cvmfs/lhcb.cern.ch/lib/lcg/releases",
+ help="where to find LCG installed packages",
+ )
args = parser.parse_args()
@@ -216,7 +239,7 @@ def main():
output = {
"LCG_{}".format(args.version): {
"{}.cmake".format(platform.split("=", 1)[0]): _entry_point(
- args.version, platform
+ args.version, platform, args.lcg_base
)
for platform in args.platform
},
@@ -321,7 +344,7 @@ foreach(bit IN ITEMS VERSION ARCHITECTURE OS COMPILER OPTIMIZATION PLATFORM SYST
message(STATUS "LCG_${{bit}} -> ${{LCG_${{bit}}}}")
endforeach()
-set(LCG_releases_base "/cvmfs/lhcb.cern.ch/lib/lcg/releases" CACHE PATH "Where to look for LCG releases")
+set(LCG_releases_base "{lcg_base}" CACHE PATH "Where to look for LCG releases")
set(FRAGMENTS_DIR ${{CMAKE_CURRENT_LIST_DIR}}/../fragments)
#[[---.rst