diff --git a/builtins/davix/CMakeLists.txt b/builtins/davix/CMakeLists.txt index 8698127026a7f..d5c19ca89bb3b 100644 --- a/builtins/davix/CMakeLists.txt +++ b/builtins/davix/CMakeLists.txt @@ -48,6 +48,7 @@ ExternalProject_Add(DAVIX -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DLIB_SUFFIX= + PATCH_COMMAND sed -i "" -e "s|sed -i '| sed -i \"\" '|g" -e "s/gcc/cc/g" patch-curl-clock-gettime.sh LOG_BUILD 1 LOG_CONFIGURE 1 LOG_DOWNLOAD 1 LOG_INSTALL 1 BUILD_BYPRODUCTS ${DAVIX_LIBRARIES} TIMEOUT 600) diff --git a/core/unix/src/TUnixSystem.cxx b/core/unix/src/TUnixSystem.cxx index 9e17108412fea..83be91c61df09 100644 --- a/core/unix/src/TUnixSystem.cxx +++ b/core/unix/src/TUnixSystem.cxx @@ -4817,12 +4817,12 @@ static void GetFreeBSDSysInfo(SysInfo_t *sysinfo) // it probably would be better to get this information from syscalls // this is possibly less error prone FILE *p = gSystem->OpenPipe("sysctl -n kern.ostype hw.model hw.ncpu " - "hw.physmem dev.cpu.0.freq", "r"); + "hw.realmem dev.cpu.0.freq", "r"); TString s; s.Gets(p); sysinfo->fOS = s; s.Gets(p); - sysinfo->fModel = s; + sysinfo->fCpuType = s; s.Gets(p); sysinfo->fCpus = s.Atoi(); s.Gets(p); @@ -4830,13 +4830,13 @@ static void GetFreeBSDSysInfo(SysInfo_t *sysinfo) sysinfo->fPhysRam = Int_t(t / 1024 / 1024); s.Gets(p); t = s.Atoll(); - sysinfo->fCpuSpeed = Int_t(t / 1000000); + sysinfo->fCpuSpeed = Int_t(t); gSystem->ClosePipe(p); } static void GetFreeBSDCpuInfo(CpuInfo_t*, Int_t) { - //not yet implemented + Error("ListSymbols", "not yet implemented"); } #endif