From 6f28b0d86918db6409210af3db5692812d00bc0a Mon Sep 17 00:00:00 2001 From: Philippe Canal Date: Fri, 21 Aug 2026 10:55:20 -0500 Subject: [PATCH 1/3] Remove AIX support --- README/ReleaseNotes/v642/index.md | 1 + config/root-config.in | 19 ------- config/thisroot.csh | 6 --- core/dictgen/src/rootcling_impl.cxx | 7 --- core/foundation/inc/ROOT/RConfig.hxx | 8 --- core/foundation/inc/ThreadLocalStorage.h | 2 +- .../src/textinput/TerminalConfigUnix.h | 4 -- core/unix/src/TUnixSystem.cxx | 53 +++---------------- etc/Makefile.arch | 21 -------- graf2d/x11/CMakeLists.txt | 5 -- graf2d/x11/src/TGX11.cxx | 3 -- io/dcache/src/TDCacheFile.cxx | 2 +- io/io/src/TStreamerInfoActions.cxx | 10 ++-- math/mathcore/inc/Math/KDTree.h | 8 --- math/mathcore/inc/Math/KDTree.icc | 5 +- math/mathcore/src/SpecFuncMathCore.cxx | 2 +- roottest/scripts/Event.mk | 8 --- 17 files changed, 16 insertions(+), 148 deletions(-) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 60d82bd7af8b2..1d9381baa9f56 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -59,6 +59,7 @@ The following people have contributed to this new version: * The **JsMVA** feature for interactive TMVA training in Jupyter notebooks is now removed. It was not functional for years and was therefore already excluded from ROOT 6.38. This also removes the `TMVA::IPythonInteractive` class and the related interactive-training interfaces from the TMVA method and fitter classes, such as `MethodBase::ExitFromTraining()` or `FitterBase::SetIPythonInteractive()`. * The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development. * The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead. +* Support for the AIX operating system has been removed from the codebase. This support has not been tested since the late v5 releases and the LLVM JIT is not yet supporting AIX. ## Build System diff --git a/config/root-config.in b/config/root-config.in index 3750c097b4eec..55a80b22e8f70 100755 --- a/config/root-config.in +++ b/config/root-config.in @@ -6,9 +6,6 @@ # Author: Fons Rademakers, 06/06/99 readlink=readlink -if [ `uname` = "AIX" ]; then - readlink=echo -fi # work around readlink versions not having -f option fullpath1=`$readlink "$0"` @@ -158,22 +155,6 @@ cxxversionflag="@configstd@ " auxcflags="${cxxversionflag} " case $arch in -aix5) - # IBM AIX - auxcflags="-qnoro -qnoroconst -qmaxmem=-1 -qrtti=all" - auxlibs= - #forcelibs=$rootulibs - #forceglibs=$rootuglibs - #forceevelibs=$rootuevelibs - ;; -aixgcc) - # IBM AIX with g++ - auxcflags+="-fsigned-char -fsized-deallocation" - auxlibs= - #forcelibs=$rootulibs - #forceglibs=$rootuglibs - #forceevelibs=$rootuevelibs - ;; solarisgcc) # Solaris g++ 2.8.x auxlibs="-L/usr/ccs/lib -lm -lsocket -lgen -ldl" diff --git a/config/thisroot.csh b/config/thisroot.csh index e5b34f9815ccd..3895bfceab285 100644 --- a/config/thisroot.csh +++ b/config/thisroot.csh @@ -219,12 +219,6 @@ else setenv SHLIB_PATH @libdir@ endif -if ($?LIBPATH) then - setenv LIBPATH @libdir@:$LIBPATH # AIX -else - setenv LIBPATH @libdir@ -endif - if ($?PYTHONPATH) then setenv PYTHONPATH @libdir@:$PYTHONPATH else diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx index caf295b27f703..2f752392dce28 100644 --- a/core/dictgen/src/rootcling_impl.cxx +++ b/core/dictgen/src/rootcling_impl.cxx @@ -1193,9 +1193,7 @@ void WriteNamespaceInit(const clang::NamespaceDecl *cl, dictStream << " namespace ROOTDict {" << std::endl; -#if !defined(R__AIX) dictStream << " inline ::ROOT::TGenericClassInfo *GenerateInitInstance();" << std::endl; -#endif if (!Namespace__HasMethod(cl, "Dictionary", interp)) dictStream << " static TClass *" << mappedname.c_str() << "_Dictionary();" << std::endl; @@ -1203,13 +1201,8 @@ void WriteNamespaceInit(const clang::NamespaceDecl *cl, << " // Function generating the singleton type initializer" << std::endl -#if !defined(R__AIX) << " inline ::ROOT::TGenericClassInfo *GenerateInitInstance()" << std::endl << " {" << std::endl -#else - << " ::ROOT::TGenericClassInfo *GenerateInitInstance()" << std::endl - << " {" << std::endl -#endif << " static ::ROOT::TGenericClassInfo " << std::endl diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx index f5f44017d5785..6f49eedae02f9 100644 --- a/core/foundation/inc/ROOT/RConfig.hxx +++ b/core/foundation/inc/ROOT/RConfig.hxx @@ -67,14 +67,6 @@ # endif #endif -#ifdef _AIX -# define R__AIX -# define R__UNIX -# define ANSICPP -# define R__SEEK64 -# define NEED_STRCASECMP -#endif - #if defined(__linux) || defined(__linux__) # ifndef linux # define linux diff --git a/core/foundation/inc/ThreadLocalStorage.h b/core/foundation/inc/ThreadLocalStorage.h index 69140c6a3c77a..d8fb8faedc519 100644 --- a/core/foundation/inc/ThreadLocalStorage.h +++ b/core/foundation/inc/ThreadLocalStorage.h @@ -71,7 +71,7 @@ # define R__HAS_PTHREAD # endif #endif -#if defined(R__LINUX) || defined(R__AIX) +#if defined(R__LINUX) # define R__HAS___THREAD #endif #if defined(R__SOLARIS) && !defined(R__HAS_PTHREAD) diff --git a/core/textinput/src/textinput/TerminalConfigUnix.h b/core/textinput/src/textinput/TerminalConfigUnix.h index 474255d3bb362..ed798f76a9301 100644 --- a/core/textinput/src/textinput/TerminalConfigUnix.h +++ b/core/textinput/src/textinput/TerminalConfigUnix.h @@ -29,10 +29,6 @@ namespace textinput { // Solaris doesn't define sig_t typedef SIG_TYP sig_t; #endif -#if defined(_AIX) && !defined(sig_t) -// AIX doesn't define sig_t -typedef void (*sig_t)(int); -#endif class TerminalConfigUnix { private: diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx index 17efe4c182da5..5fe7ac64446e5 100644 --- a/core/unix/src/TUnixSystem.cxx +++ b/core/unix/src/TUnixSystem.cxx @@ -48,7 +48,7 @@ #include #include #include -#if defined(R__SUN) || defined(R__AIX) || \ +#if defined(R__SUN) || \ defined(R__LINUX) || defined(R__SOLARIS) || \ defined(R__FBSD) || defined(R__OBSD) || \ defined(R__MACOSX) || defined(R__HURD) @@ -62,12 +62,12 @@ #if defined(ULTRIX) || defined(R__SUN) # include #endif -#if defined(R__AIX) || defined(R__LINUX) || \ +#if defined(R__LINUX) || \ defined(R__FBSD) || defined(R__OBSD) || \ defined(R__LYNXOS) || defined(R__MACOSX) || defined(R__HURD) # include #endif -#if defined(R__AIX) || defined(R__SOLARIS) +#if defined(R__SOLARIS) # include #endif #if defined(R__MACOSX) @@ -108,17 +108,7 @@ #include #include #include -#if defined(R__AIX) -# define _XOPEN_EXTENDED_SOURCE -# include -# undef _XOPEN_EXTENDED_SOURCE -# if !defined(_AIX41) && !defined(_AIX43) - // AIX 3.2 doesn't have it -# define HASNOT_INETATON -# endif -#else -# include -#endif +#include #include #include #include @@ -149,7 +139,7 @@ # endif #endif -#if defined(R__AIX) || defined(R__FBSD) || \ +#if defined(R__FBSD) || \ defined(R__OBSD) || defined(R__LYNXOS) || \ (defined(R__MACOSX) && !defined(MAC_OS_X_VERSION_10_5)) # define UTMP_NO_ADDR @@ -721,7 +711,7 @@ const char *TUnixSystem::GetError() if (err == 0 && GetLastErrorString() != "") return GetLastErrorString(); -#if defined(R__SOLARIS) || defined (R__LINUX) || defined(R__AIX) || \ +#if defined(R__SOLARIS) || defined (R__LINUX) || \ defined(R__FBSD) || defined(R__OBSD) || defined(R__HURD) return strerror(err); #else @@ -1667,11 +1657,7 @@ int TUnixSystem::Link(const char *from, const char *to) int TUnixSystem::Symlink(const char *from, const char *to) { -#if defined(R__AIX) - return ::symlink((char*)from, (char*)to); -#else return ::symlink(from, to); -#endif } //////////////////////////////////////////////////////////////////////////////// @@ -1815,18 +1801,9 @@ Bool_t TUnixSystem::ExpandPathName(TString &patbuf0) // read first argument patbuf0 = ""; - int cnt = 0; -#if defined(R__AIX) -again: -#endif for (ch = fgetc(pf); ch != EOF && ch != ' ' && ch != '\n'; ch = fgetc(pf)) { patbuf0.Append(ch); - cnt++; } -#if defined(R__AIX) - // Work around bug timing problem due to delay in forking a large program - if (cnt == 0 && ch == EOF) goto again; -#endif // skip rest of pipe while (ch != EOF) { @@ -2324,11 +2301,6 @@ void TUnixSystem::StackTrace() delete [] gdb; return; -#elif defined(R__AIX) - TString script = "procstack "; - script += GetPid(); - Exec(script); - return; #elif defined(R__SOLARIS) char *cppfilt = Which(Getenv("PATH"), "c++filt", kExecutePermission); TString script = "pstack "; @@ -2877,7 +2849,7 @@ const char *TUnixSystem::GetLinkedLibraries() ClosePipe(p); } #endif -#elif defined(R__LINUX) || defined(R__SOLARIS) || defined(R__AIX) +#elif defined(R__LINUX) || defined(R__SOLARIS) #if defined(R__WINGCC ) const char *cLDD="cygcheck"; const char *cSOEXT=".dll"; @@ -2895,13 +2867,8 @@ const char *TUnixSystem::GetLinkedLibraries() TRegexp sovers = "\\.so\\.[0-9]+"; #else const char *cLDD="ldd"; -#if defined(R__AIX) - const char *cSOEXT=".a"; - TRegexp sovers = "\\.a\\.[0-9]+"; -#else const char *cSOEXT=".so"; TRegexp sovers = "\\.so\\.[0-9]+"; -#endif #endif FILE *p = OpenPipe(TString::Format("%s '%s'", cLDD, exe), "r"); if (p) { @@ -3282,10 +3249,8 @@ void TUnixSystem::CloseConnection(int sock, Bool_t force) { if (sock < 0) return; -#if !defined(R__AIX) || defined(_AIX41) || defined(_AIX43) if (force) ::shutdown(sock, 2); // will also close connection of parent -#endif while (::close(sock) == -1 && GetErrno() == EINTR) ResetErrno(); @@ -4639,9 +4604,7 @@ static const char *DynamicPath(const char *newpath = nullptr, Bool_t reset = kFA rdynpath = ".:"; rdynpath += TROOT::GetLibDir(); } TString ldpath; - #if defined (R__AIX) - ldpath = gSystem->Getenv("LIBPATH"); - #elif defined(R__MACOSX) + #if defined(R__MACOSX) ldpath = gSystem->Getenv("DYLD_LIBRARY_PATH"); if (!ldpath.IsNull()) ldpath += ":"; diff --git a/etc/Makefile.arch b/etc/Makefile.arch index 3994320e003fa..c098e3b832a82 100644 --- a/etc/Makefile.arch +++ b/etc/Makefile.arch @@ -95,27 +95,6 @@ LDFLAGS = $(OPT2) SOFLAGS = -shared endif -ifeq ($(ARCH),aix5) -# IBM AIX >5.x xlC -CXX = xlC -CXXFLAGS = $(OPT) -LD = xlC -LDFLAGS = $(OPT) -SOFLAGS = -DllSuf = a -endif - -ifeq ($(ARCH),aixgcc) -# IBM AIX >5.x with GCC -CXX = g++ -CXXFLAGS = $(OPT) -LD = g++ -LDFLAGS = $(OPT) -SOFLAGS = -shared -DllSuf = a -EXPLLINKLIBS = $(ROOTGLIBS) -endif - ifeq ($(ARCH),solaris) # Solaris CC CXX = /opt/SUNWspro/bin/CC diff --git a/graf2d/x11/CMakeLists.txt b/graf2d/x11/CMakeLists.txt index 987277c3c16e4..665ba873d5212 100644 --- a/graf2d/x11/CMakeLists.txt +++ b/graf2d/x11/CMakeLists.txt @@ -34,8 +34,3 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GX11 target_include_directories(GX11 PRIVATE ${X11_INCLUDE_DIR}) target_include_directories(GX11 PRIVATE ../gifencode) - - -if(AIX) - target_include_directories(GX11 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc) -endif() diff --git a/graf2d/x11/src/TGX11.cxx b/graf2d/x11/src/TGX11.cxx index 9d624a4fd4f39..728bd48aab0e3 100644 --- a/graf2d/x11/src/TGX11.cxx +++ b/graf2d/x11/src/TGX11.cxx @@ -58,9 +58,6 @@ by Olivier Couet (package X11INT). #include #include #include -#ifdef R__AIX -# include -#endif #include "gifencode.h" #include "gifdecode.h" diff --git a/io/dcache/src/TDCacheFile.cxx b/io/dcache/src/TDCacheFile.cxx index 3243b791e3963..48ed6e488c786 100644 --- a/io/dcache/src/TDCacheFile.cxx +++ b/io/dcache/src/TDCacheFile.cxx @@ -36,7 +36,7 @@ TFile behaviour. #ifndef R__WIN32 #include #if defined(R__SUN) || defined(R__HPUX) || \ - defined(R__AIX) || defined(R__LINUX) || defined(R__SOLARIS) || \ + defined(R__LINUX) || defined(R__SOLARIS) || \ defined(R__HIUX) || defined(R__FBSD) || defined(R__MACOSX) || \ defined(R__HURD) || defined(R__OBSD) #define HAS_DIRENT diff --git a/io/io/src/TStreamerInfoActions.cxx b/io/io/src/TStreamerInfoActions.cxx index bebd784eacd7d..72f44fc29ee5d 100644 --- a/io/io/src/TStreamerInfoActions.cxx +++ b/io/io/src/TStreamerInfoActions.cxx @@ -35,11 +35,7 @@ static const Int_t kRegrouped = TStreamerInfo::kOffsetL; using namespace TStreamerInfoActions; -#ifdef _AIX -# define INLINE_TEMPLATE_ARGS -#else -# define INLINE_TEMPLATE_ARGS inline -#endif +#define INLINE_TEMPLATE_ARGS inline namespace TStreamerInfoActions @@ -5564,7 +5560,7 @@ TStreamerInfoActions::TActionSequence *TStreamerInfoActions::TActionSequence::Cr return sequence; } -#if !defined(R__WIN32) && !defined(_AIX) +#if !defined(R__WIN32) #include @@ -5573,7 +5569,7 @@ TStreamerInfoActions::TActionSequence *TStreamerInfoActions::TActionSequence::Cr typedef void (*voidfunc)(); static const char *R__GetSymbolName(voidfunc func) { -#if defined(R__WIN32) || defined(__CYGWIN__) || defined(_AIX) +#if defined(R__WIN32) || defined(__CYGWIN__) return "not available on this platform"; #if 0 MEMORY_BASIC_INFORMATION mbi; diff --git a/math/mathcore/inc/Math/KDTree.h b/math/mathcore/inc/Math/KDTree.h index 411b2e8445b52..f786bfff29f50 100644 --- a/math/mathcore/inc/Math/KDTree.h +++ b/math/mathcore/inc/Math/KDTree.h @@ -196,11 +196,7 @@ namespace ROOT const BinNode* FindNode(const point_type& rPoint) const override; point_type GetBinCenter() const; Double_t GetBinContent() const {return GetSumw();} -#ifndef _AIX virtual const std::vector& GetBoundaries() const {return fBoundaries;} -#else - virtual void GetBoundaries() const { } -#endif Double_t GetDensity() const {return GetBinContent()/GetVolume();} Double_t GetEffectiveEntries() const {return (GetSumw2()) ? std::pow(GetSumw(),2)/GetSumw2() : 0;} UInt_t GetEntries() const {return fEntries;} @@ -244,11 +240,7 @@ namespace ROOT virtual ~TerminalNode(); void EmptyBin() override; -#ifndef _AIX const std::vector& GetBoundaries() const override; -#else - void GetBoundaries() const override; -#endif void GetClosestPoints(const point_type& rRef,UInt_t nPoints,std::vector >& vFoundPoints) const override; const std::vector& GetPoints() const {return fDataPoints;} void GetPointsWithinDist(const point_type& rRef,value_type fDist,std::vector& vFoundPoints) const override; diff --git a/math/mathcore/inc/Math/KDTree.icc b/math/mathcore/inc/Math/KDTree.icc index 9dce10c76f26f..a5a59e4a7646c 100644 --- a/math/mathcore/inc/Math/KDTree.icc +++ b/math/mathcore/inc/Math/KDTree.icc @@ -1012,9 +1012,6 @@ namespace ROOT } //______________________________________________________________________________ template -#ifdef _AIX - void KDTree<_DataPoint>::TerminalNode::GetBoundaries() const { } -#else const std::vector::TerminalNode::tBoundary>& KDTree<_DataPoint>::TerminalNode::GetBoundaries() const { //returns the boundaries of this TerminalNode @@ -1034,7 +1031,7 @@ namespace ROOT return BinNode::GetBoundaries(); } -#endif + //______________________________________________________________________________ template void KDTree<_DataPoint>::TerminalNode::GetClosestPoints(const _DataPoint& rRef,UInt_t nPoints, diff --git a/math/mathcore/src/SpecFuncMathCore.cxx b/math/mathcore/src/SpecFuncMathCore.cxx index 1d158b65717d4..eedd3f5af5f86 100644 --- a/math/mathcore/src/SpecFuncMathCore.cxx +++ b/math/mathcore/src/SpecFuncMathCore.cxx @@ -8,7 +8,7 @@ * * **********************************************************************/ -#if defined(__sun) || defined(__sgi) || defined(_WIN32) || defined(_AIX) +#if defined(__sun) || defined(__sgi) || defined(_WIN32) #define NOT_HAVE_TGAMMA #endif diff --git a/roottest/scripts/Event.mk b/roottest/scripts/Event.mk index f11e167dfbe9e..ce0c78e713f4d 100644 --- a/roottest/scripts/Event.mk +++ b/roottest/scripts/Event.mk @@ -42,12 +42,6 @@ $(EVENTO): %.$(ObjSuf): %.d $(MAINEVENTO): MainEvent.d $(EVENTSO): $(EVENTO) $(ROOTCORELIBS) -ifeq ($(ARCH),aix) - $(CMDECHO) /usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^ -else -ifeq ($(ARCH),aix5) - $(CMDECHO) /usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^ -else ifeq ($(PLATFORM),win32) $(CMDECHO) bindexplib $* $(EVENTO) > $*.def $(CMDECHO) lib -nologo -MACHINE:IX86 $(EVENTO) -def:$*.def \ @@ -57,8 +51,6 @@ ifeq ($(PLATFORM),win32) else $(CMDECHO) $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS) endif -endif -endif $(EVENT): $(EVENTSO) $(MAINEVENTO) $(ROOTCORELIBS) $(CMDECHO) $(LD) $(LDFLAGS) $(MAINEVENTO) $(EVENTLIB) $(LIBS) \ From f093e419eccaf58d710920987b55f7d6bbb80789 Mon Sep 17 00:00:00 2001 From: Philippe Canal Date: Tue, 25 Aug 2026 15:41:54 -0500 Subject: [PATCH 2/3] [core] Remove LIBPATH support (since AIX is no longer supported --- config/thisroot.csh | 14 -------------- config/thisroot.sh | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/config/thisroot.csh b/config/thisroot.csh index 3895bfceab285..4daac5e37d1ff 100644 --- a/config/thisroot.csh +++ b/config/thisroot.csh @@ -90,13 +90,6 @@ if ($?old_rootsys) then -e "s;^$old_rootsys/lib:;;g" \ -e "s;^$old_rootsys/lib${DOLLAR};;g"` endif - if ($?LIBPATH) then - setenv LIBPATH `set DOLLAR='$'; echo $LIBPATH | \ - sed -e "s;:$old_rootsys/lib:;:;g" \ - -e "s;:$old_rootsys/lib${DOLLAR};;g" \ - -e "s;^$old_rootsys/lib:;;g" \ - -e "s;^$old_rootsys/lib${DOLLAR};;g"` - endif if ($?PYTHONPATH) then setenv PYTHONPATH `set DOLLAR='$'; echo $PYTHONPATH | \ sed -e "s;:$old_rootsys/lib:;:;g" \ @@ -126,13 +119,6 @@ if ($?old_rootsys) then -e "s;^$old_rootsys/lib/root:;;g" \ -e "s;^$old_rootsys/lib/root${DOLLAR};;g"` endif - if ($?LIBPATH) then - setenv LIBPATH `set DOLLAR='$'; echo $LIBPATH | \ - sed -e "s;:$old_rootsys/lib/root:;:;g" \ - -e "s;:$old_rootsys/lib/root${DOLLAR};;g" \ - -e "s;^$old_rootsys/lib/root:;;g" \ - -e "s;^$old_rootsys/lib/root${DOLLAR};;g"` - endif if ($?PYTHONPATH) then setenv PYTHONPATH `set DOLLAR='$'; echo $PYTHONPATH | \ sed -e "s;:$old_rootsys/lib/root:;:;g" \ diff --git a/config/thisroot.sh b/config/thisroot.sh index 2901e79d632bb..d2ce449a5ea08 100644 --- a/config/thisroot.sh +++ b/config/thisroot.sh @@ -52,11 +52,6 @@ clean_environment() drop_from_path "$newpath" "${old_rootsys}/lib/root" SHLIB_PATH=$newpath fi - if [ -n "${LIBPATH-}" ]; then - drop_from_path "$LIBPATH" "${old_rootsys}/lib" - drop_from_path "$newpath" "${old_rootsys}/lib/root" - LIBPATH=$newpath - fi if [ -n "${PYTHONPATH-}" ]; then drop_from_path "$PYTHONPATH" "${old_rootsys}/lib" drop_from_path "$newpath" "${old_rootsys}/lib/root" @@ -132,14 +127,6 @@ set_environment() export SHLIB_PATH fi - if [ -z "${LIBPATH-}" ]; then - LIBPATH=@libdir@ - export LIBPATH # Linux, ELF HP-UX - else - LIBPATH=@libdir@:$LIBPATH - export LIBPATH - fi - if [ -z "${PYTHONPATH-}" ]; then PYTHONPATH=@libdir@ export PYTHONPATH # Linux, ELF HP-UX From cfe3426c25da7c923d115aef3fee2be05e334c9e Mon Sep 17 00:00:00 2001 From: Philippe Canal Date: Tue, 25 Aug 2026 15:43:26 -0500 Subject: [PATCH 3/3] [core] Fix harmful typo in thisroot.csh. Change from DEFAULT_ROOT_INLUCDE_PATH to DEFAULT_ROOT_INCLUDE_PATH --- config/thisroot.csh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/thisroot.csh b/config/thisroot.csh index 4daac5e37d1ff..779a9b265165d 100644 --- a/config/thisroot.csh +++ b/config/thisroot.csh @@ -236,9 +236,9 @@ else endif if ($?ROOT_INCLUDE_PATH) then - setenv ROOT_INCLUDE_PATH @DEFAULT_ROOT_INLUCDE_PATH@:$ROOT_INCLUDE_PATH + setenv ROOT_INCLUDE_PATH @DEFAULT_ROOT_INCLUDE_PATH@:$ROOT_INCLUDE_PATH else - setenv ROOT_INCLUDE_PATH @DEFAULT_ROOT_INLUCDE_PATH@ + setenv ROOT_INCLUDE_PATH @DEFAULT_ROOT_INCLUDE_PATH@ endif endif # if ("$thisrootdir" != "")