diff -uNr pythia6.ORIG/idate.c pythia6/idate.c --- pythia6.ORIG/idate.c 2012-05-02 15:46:18.000000000 +0900 +++ pythia6/idate.c 2012-05-02 15:46:18.000000000 +0900 @@ -0,0 +1,25 @@ +#include + +void idate_(int idtemp[]) +{ + struct tm q; + time_t tp; + + time(&tp); + q = *localtime(&tp); + idtemp[0] = q.tm_year + 1900; + idtemp[1] = q.tm_mon + 1; + idtemp[2] = q.tm_mday; +} + +void itime_(int idtemp[]) +{ + struct tm q; + time_t tp; + + time(&tp); + q = *localtime(&tp); + idtemp[0] = q.tm_hour; + idtemp[1] = q.tm_min; + idtemp[2] = q.tm_sec; +} diff -uNr pythia6.ORIG/makePythia6.linux pythia6/makePythia6.linux --- pythia6.ORIG/makePythia6.linux 2007-09-27 19:57:18.000000000 +0900 +++ pythia6/makePythia6.linux 2012-05-02 15:46:18.000000000 +0900 @@ -1,7 +1,9 @@ # /bin/sh -g77 -c -fPIC pythia*.f -g77 -c -fPIC -fno-second-underscore tpythia6_called_from_cc.F +gfortran -c -fPIC pythia*.f +gfortran -c -fPIC -fno-second-underscore tpythia6_called_from_cc.F echo 'void MAIN__() {}' >main.c gcc -c -fPIC main.c gcc -c -fPIC pythia6_common_address.c -g77 -shared -Wl,-soname,libPythia6.so -o libPythia6.so main.o pythia*.o tpythia*.o +gcc -c -fPIC idate.c +gfortran -c -fPIC pydatawrapper.F +gfortran -shared -Wl,-soname,libPythia6.so -o libPythia6.so main.o pythia*.o tpythia*.o idate.o pydatawrapper.o diff -uNr pythia6.ORIG/makePythia6.macosx pythia6/makePythia6.macosx --- pythia6.ORIG/makePythia6.macosx 2007-09-27 19:57:19.000000000 +0900 +++ pythia6/makePythia6.macosx 2012-05-02 15:46:18.000000000 +0900 @@ -1,14 +1,16 @@ # /bin/sh -g77 -c pythia*.f -g77 -fno-second-underscore -c tpythia6_called_from_cc.F +gfortran -c pythia*.f +gfortran -c pydatawrapper.F +gfortran -fno-second-underscore -c tpythia6_called_from_cc.F echo 'void MAIN__() {}' > main.c gcc -c main.c gcc -c pythia6_common_address.c -g77 -v -bundle -flat_namespace -undefined dynamic_lookup -o libPythia6.so \ - main.o tpythia6_called_from_cc.o pythia*.o -g77 -dynamiclib -flat_namespace -single_module -undefined dynamic_lookup \ - -install_name $HOME/pythia6/libPythia6.dylib -o libPythia6.dylib \ - main.o tpythia6_called_from_cc.o pythia*.o +gcc -c idate.c +rm -f libPythia6.dylib libPythia6.so +gfortran -dynamiclib -flat_namespace -single_module -undefined dynamic_lookup \ + -install_name @rpath/libPythia6.dylib -o libPythia6.dylib \ + main.o tpythia6_called_from_cc.o pythia*.o pydatawrapper.o idate.o +ln -s libPythia6.dylib libPythia6.so rm -f libPythia6.a -ar rv libPythia6.a main.o tpythia6_called_from_cc.o pythia*.o +ar rv libPythia6.a main.o tpythia6_called_from_cc.o pythia*.o pydatawrapper.o idate.o ranlib libPythia6.a diff -uNr pythia6.ORIG/makePythia6.macosx64 pythia6/makePythia6.macosx64 --- pythia6.ORIG/makePythia6.macosx64 2009-04-08 23:36:42.000000000 +0900 +++ pythia6/makePythia6.macosx64 2012-05-02 15:52:41.000000000 +0900 @@ -7,14 +7,15 @@ macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` gfortran -m64 -c pythia*.f +gfortran -c pydatawrapper.F gfortran -m64 -fno-second-underscore -c tpythia6_called_from_cc.F echo 'void MAIN__() {}' > main.c gcc -m64 -c main.c gcc -m64 -c pythia6_common_address.c +gcc -c idate.c rm -f libPythia6.dylib libPythia6.so gcc -m64 -dynamiclib -single_module -undefined dynamic_lookup \ - -install_name $HOME/pythia6/libPythia6.dylib -o libPythia6.dylib \ - main.o tpythia6_called_from_cc.o pythia*.o \ - `gfortran -m64 -print-file-name=libgfortran.dylib` \ - `gfortran -m64 -print-file-name=libgfortran.a` + -install_name @rpath/libPythia6.dylib -o libPythia6.dylib \ + main.o tpythia6_called_from_cc.o pythia*.o pydatawrapper.o idate.o \ + `gfortran -m64 -print-file-name=libgfortran.dylib` ln -s libPythia6.dylib libPythia6.so diff -uNr pythia6.ORIG/pydatawrapper.F pythia6/pydatawrapper.F --- pythia6.ORIG/pydatawrapper.F 2012-05-02 15:46:18.000000000 +0900 +++ pythia6/pydatawrapper.F 2012-05-02 15:46:18.000000000 +0900 @@ -0,0 +1,8 @@ + subroutine pydatawrapper + external pydata + call pydatadummysub(pydata) + return + end + subroutine pydatadummysub(a) + return + end