Update of /cvsroot/fink/experimental/mommsen/10.4/main In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5371
Modified Files: root5.patch Log Message: Fix patch for cernlib-g77 Index: root5.patch =================================================================== RCS file: /cvsroot/fink/experimental/mommsen/10.4/main/root5.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- root5.patch 23 Jan 2007 00:50:25 -0000 1.1 +++ root5.patch 23 Jan 2007 14:36:15 -0000 1.2 @@ -35,9 +35,9 @@ if test "x$k" = "xlibz" ; then found_libz=$found_lib found_dirz=$found_dir ---- root.old/config/Makefile.macosx 2006-08-31 09:15:57.000000000 -0500 -+++ root.new/config/Makefile.macosx 2007-01-22 14:54:09.000000000 -0600 -@@ -81,23 +81,17 @@ +--- root.old/config/Makefile.macosx 2007-01-23 08:29:24.000000000 -0600 ++++ root.new/config/Makefile.macosx 2007-01-23 08:33:19.000000000 -0600 +@@ -81,17 +81,18 @@ ifeq ($(MACOSX_MINOR),4) ifeq (g95,$(findstring g95,$(ROOTBUILD))) F77 = g95 @@ -55,16 +55,11 @@ +F77LIBS = -lg2c endif --# We add libg2c only in case of ppc because then we probably have cernlib --# compiled with g77. In case of Intel Mac it should be compiled with the --# same fortran we use. --ifeq ($(MACOSX_CPU),powerpc) --F77LIBS += -L$(FINK_DIR)/lib -lg2c --endif +F77LIBS := `$(F77) -print-search-dirs | awk '/^install:/{printf("-L%s -L%s../../../\n", $$2, $$2)}'` $(F77LIBS) - - ifeq ($(shell find $(FINK_DIR)/bin -name $(F77)),) - BUILDHBOOK := no ++ + # We add libg2c only in case of ppc because then we probably have cernlib + # compiled with g77. In case of Intel Mac it should be compiled with the + # same fortran we use. --- root.old/config/Makefile.depend 6 Dec 2006 14:42:26 -0000 1.97 +++ root.new/config/Makefile.depend 16 Dec 2006 22:22:38 -0000 @@ -4,85 +4,97 @@ ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits