diff --git a/.github/workflows/root-ci-config/buildconfig/mac13.txt b/.github/workflows/root-ci-config/buildconfig/mac13.txt index f1206b5371ce9..ca7b20ae43bee 100644 --- a/.github/workflows/root-ci-config/buildconfig/mac13.txt +++ b/.github/workflows/root-ci-config/buildconfig/mac13.txt @@ -1,3 +1,4 @@ +CMAKE_BUILD_RPATH=/usr/local/lib asimage_tiff=OFF builtin_cfitsio=ON builtin_cppzmq=ON @@ -27,7 +28,6 @@ builtin_zeromq=ON builtin_zstd=ON ccache=ON cocoa=ON -fortran=OFF minuit2_omp=OFF pythia8=OFF test_distrdf_dask=ON diff --git a/main/src/h2root.cxx b/main/src/h2root.cxx index b839c9d8319b4..c119b2e40100c 100644 --- a/main/src/h2root.cxx +++ b/main/src/h2root.cxx @@ -312,11 +312,7 @@ int main(int argc, char **argv) int lun = 10; #ifndef WIN32 - // "px" is a string being changed to "pxc" in the fortran side; since it's a temporary on C's side, - // we need a buffer of at least 3 chars on Cs side, too. Predefine it as a extra variable "px " since that way - // the space will be replaced by 'c' on the preallocated memory, instead of appending a new char (new memory) to "px". - auto opt = PASSCHAR("px "); - hropen(lun,PASSCHAR("example"),PASSCHAR(file_in),opt,record_size,ier,7,strlen(file_in),2); + hropen(lun,PASSCHAR("example"),PASSCHAR(file_in),PASSCHAR("px"),record_size,ier,7,strlen(file_in),2); #else hropen(lun,PASSCHAR("example"),PASSCHAR(file_in),PASSCHAR("px"),record_size,ier); #endif diff --git a/misc/minicern/src/hbook.f b/misc/minicern/src/hbook.f index 522c731686169..6c107c3ff1c4b 100644 --- a/misc/minicern/src/hbook.f +++ b/misc/minicern/src/hbook.f @@ -249,6 +249,9 @@ SUBROUTINE HROPEN(LUN,CHDIR,CFNAME,CHOPTT,LRECL,ISTAT) CHARACTER*(*) CFNAME,CHDIR,CHOPTT CHARACTER*8 CHOPT CHOPT=CHOPTT + DO 11 I=LEN(CHOPTT)+1,8 + CHOPT(I:I) = ' ' + 11 CONTINUE CALL CLTOU(CHOPT) DO 10 I=1,NCHTOP IF(CFNAME.EQ.HFNAME(I))THEN