rpms/cernlib/FC-4 029-fixes-for-MacOSX, NONE, 1.1 cernlib.spec, 1.3, 1.4

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Fri Nov 18 15:33:18 UTC 2005 

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24987

Modified Files:
	cernlib.spec 
Added Files:
	029-fixes-for-MacOSX 
Log Message:
add debian patch for MacOSX that should fix the PPC build



--- NEW FILE 029-fixes-for-MacOSX ---
--- src/Imakefile.old	2003-05-09 21:59:03.000000000 +0200
+++ src/Imakefile	2003-05-09 22:03:34.000000000 +0200
@@ -8,8 +8,12 @@
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
 #ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
+SUBDIRS:= $(SUBDIRS) scripts
+#else
 SUBDIRS:= $(SUBDIRS) scripts mgr
 #endif
+#endif
 
 InstallLibSubdirs($(LIBDIRS))
 
--- src/config/Imake.rules.old	2003-05-09 21:59:01.000000000 +0200
+++ src/config/Imake.rules	2003-05-09 22:08:00.000000000 +0200
@@ -2179,7 +2179,7 @@
 #define CppScriptTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs <src | CppSedMagic >$@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 	chmod a+x $@							@@\
 									@@\
 clean::									@@\
@@ -2211,7 +2211,7 @@
 #define CppFileTarget(dst,src,defs,deplist)				@@\
 dst::  src deplist							@@\
 	RemoveFile($@)							@@\
-	$(CPP) defs <src | CppSedMagic >$@				@@\
+	$(CPP) defs src | CppSedMagic >$@				@@\
 									@@\
 clean::									@@\
 	RemoveFiles(dst)
--- src/config/site.def.old	2002-04-26 16:46:04.000000000 +0200
+++ src/config/site.def	2003-05-09 22:10:02.000000000 +0200
@@ -99,9 +99,7 @@
 /*   if it is already defined and false, undef it! */
 /* do not use shift by default
 #if defined(CERNLIB_UNIX) && !defined(CERNLIB_WINNT)
-#if ! defined(CERNLIB_SHIFT)
-#define CERNLIB_SHIFT
-#elif  ! CERNLIB_SHIFT
+#if defined(CERNLIB_SHIFT) && !CERNLIB_SHIFT
 #undef CERNLIB_SHIFT
 #endif
 #endif
--- src/geant321/gxint/Imakefile.old	1997-01-29 17:37:40.000000000 +0100
+++ src/geant321/gxint/Imakefile	2003-05-09 22:16:30.000000000 +0200
@@ -30,7 +30,7 @@
 
 gxint321.f:  gxint.F
 	RemoveFile($@)
-	$(CPP) $(FORTRANALLDEFMDEPEND) < $^ | sed -e '/^$$/d' | CppSedMagic >$@
+	FortranCmd -E $(FORTRANALLDEFMDEPEND) $^ | sed -e '/^$$/d' | CppSedMagic >$@
 
 install.lib:: $(CERN_LIBDIR)/gxint.f
 
--- src/mathlib/gen/tests/c327m.F.old	1996-04-01 17:01:17.000000000 +0200
+++ src/mathlib/gen/tests/c327m.F	2003-05-09 22:18:25.000000000 +0200
@@ -92,7 +92,11 @@
 #endif
       ENDIF
       WRITE(Z,'(2D26.16)') H,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') H1,T1
+#else
       READ(Z,'(2(D22.16,4X))') H1,T1
+#endif
        IF(IDS .EQ. 1) THEN
       ERRMAX=MAX(ERRMAX,ABS(H1-T1))
       LTEST= LTEST .AND. ERRMAX .LE.  TSTERR
--- src/mathlib/gen/tests/c342m.F.old	1996-04-01 17:01:19.000000000 +0200
+++ src/mathlib/gen/tests/c342m.F	2003-05-09 22:20:19.000000000 +0200
@@ -70,7 +70,11 @@
 #endif
       END IF
       WRITE(Z,'(2D26.16)') R,T
+#if defined(CERNLIB_MACOSX)
+      READ(Z,'(2(4X,D22.16))') R1,T1
+#else
       READ(Z,'(2(D22.16,4X))') R1,T1
+#endif
       ERMAX= MAX(ERMAX,ABS(R1-T1))
       IF(IDS .EQ. 3 .OR. IDS .EQ. 4) THEN
        WRITE(LOUT,'(1X,F10.3,2F25.16,1P,D10.1)') SX,R,T,ABS(R1-T1)
--- src/mclibs/cojets/data/Imakefile.old	1996-03-27 10:31:06.000000000 +0100
+++ src/mclibs/cojets/data/Imakefile	2003-05-09 22:22:30.000000000 +0200
@@ -1,11 +1,11 @@
 
 .SUFFIXES:
 
-CopyFile(cojets.cpp,cojets.cin)
+CopyFile(cojets.cpp,cojets.s)
 CopyFile(decay.cpp,decay.cin)
 CopyFile(table.cpp,table.cin)
 
-CppFileTarget(cojets.dat,cojets.cin,NullParameter,table.cin decay.cin)
+CppFileTarget(cojets.dat,cojets.s,-E -traditional,table.cin decay.cin)
 
 PackageDirFileTarget(cojets.dat)
 
--- src/mclibs/isajet/data/Imakefile.old	1996-03-27 10:33:19.000000000 +0100
+++ src/mclibs/isajet/data/Imakefile	2003-05-09 22:24:34.000000000 +0200
@@ -1,9 +1,9 @@
 
 .SUFFIXES:
 
-CopyFile(decay.cpp,decay.cin)
+CopyFile(decay.cpp,decay.s)
 
-CppFileTarget(isajet.dat,decay.cin,NullParameter,NullParameter)
+CppFileTarget(isajet.dat,decay.s,-E -traditional ,NullParameter)
 
 PackageDirFileTarget(isajet.dat)
 
--- src/packlib/cspack/sysreq/log.c.old	2003-05-09 21:58:49.000000000 +0200
+++ src/packlib/cspack/sysreq/log.c	2003-05-09 22:27:11.000000000 +0200
@@ -80,7 +80,7 @@
 static int pid;                 /* process identifier                   */
 static int logfd ;              /* logging file descriptor              */
 #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
-  && !defined(IRIX5) && !defined(apollo)
+  && !defined(IRIX5) && !defined(apollo) && !defined(__DARWIN__)
 extern int syslog();
 #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
 extern char *getenv();
--- src/packlib/cspack/tcpaw/tcpaw.c.old	2003-05-09 21:59:03.000000000 +0200
+++ src/packlib/cspack/tcpaw/tcpaw.c	2003-05-09 22:29:58.000000000 +0200
@@ -2561,7 +2561,7 @@
 #if !defined(IBM) && !defined(_WIN32)
 /* I provide "getpass" myself as standard version truncates to 8 characters */
 #include <sys/ioctl.h>
-#ifdef CBREAK
+#if defined(CBREAK) || defined(CERNLIB_MACOSX)
 #define BSDTTY         /* First find out if BSD or SYSV terminal handling.. */
 #endif
  
@@ -2569,6 +2569,10 @@
 #include <termio.h>
 #else
 #include <sgtty.h>
+# if defined(CERNLIB_MACOSX)
+# define gtty(x,y) ioctl(x,TIOCGETP,y)
+# define stty(x,y) ioctl(x,TIOCSETP,y)
+# endif
 #endif
  
 #ifndef __convexc__
@@ -3531,3 +3535,20 @@
  
 }
 #endif
+
+#if defined(CERNLIB_MACOSX)
+  /* need to define cuserid() for OS X */
+
+char * getlogin();
+
+char *
+cuserid(char *string)
+{
+  static char cuserid_str[L_cuserid];
+  char *result = (string ? string : cuserid_str);
+  
+  strncpy(result, getlogin(), L_cuserid - 1);
+  result[L_cuserid - 1] = '\0';
+  return result;
+}
+#endif /* CERNLIB_MACOSX */
--- src/packlib/kernlib/kernbit/z268/systems.c.old	2003-05-09 21:58:50.000000000 +0200
+++ src/packlib/kernlib/kernbit/z268/systems.c	2003-05-09 22:31:41.000000000 +0200
@@ -200,7 +200,7 @@
 || defined(_IBMR2) \
 || defined(__convexc__) \
 || defined(_OSK) \
-|| defined(__linux) || defined(__FreeBSD__)
+|| defined(__linux) || defined(__FreeBSD__) || defined(__DARWIN__)
 
   void systems_( command, buf, buflen, l, chars, rc, ovflw )
 
--- src/packlib/kernlib/kernnum/d704fort/Imakefile.old	1996-06-12 12:03:53.000000000 +0200
+++ src/packlib/kernlib/kernnum/d704fort/Imakefile	2003-05-09 22:34:23.000000000 +0200
@@ -4,6 +4,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
--- src/packlib/kernlib/kernnum/f002fort/Imakefile.old	1996-06-12 12:04:09.000000000 +0200
+++ src/packlib/kernlib/kernnum/f002fort/Imakefile	2003-05-09 22:36:03.000000000 +0200
@@ -10,6 +10,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
--- src/packlib/kernlib/kernnum/f003fort/Imakefile.old	1996-06-12 12:04:12.000000000 +0200
+++ src/packlib/kernlib/kernnum/f003fort/Imakefile	2003-05-09 22:37:15.000000000 +0200
@@ -11,6 +11,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
--- src/packlib/kernlib/kernnum/f004fort/Imakefile.old	1996-06-12 12:04:16.000000000 +0200
+++ src/packlib/kernlib/kernnum/f004fort/Imakefile	2003-05-09 22:38:06.000000000 +0200
@@ -6,6 +6,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
--- src/packlib/kernlib/kernnum/f010fort/Imakefile.old	1996-06-12 12:04:19.000000000 +0200
+++ src/packlib/kernlib/kernnum/f010fort/Imakefile	2003-05-09 22:38:50.000000000 +0200
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 	 
 
--- src/packlib/kernlib/kernnum/f011fort/Imakefile.old	1996-06-12 12:04:24.000000000 +0200
+++ src/packlib/kernlib/kernnum/f011fort/Imakefile	2003-05-09 22:39:33.000000000 +0200
@@ -7,6 +7,10 @@
 FDEBUGFLAGS=NoOpFortranDebugFlags
 #endif
 
+#if defined(CERNLIB_MACOSX)
+FDEBUGFLAGS=-O0 -fPIC
+#endif
+
 FORTRANSAVEOPTION=FortranSaveFlags
 
 SubdirLibraryTarget(NullParameter,NullParameter)
--- src/pawlib/paw/programs/Imakefile.old	2003-05-09 21:59:03.000000000 +0200
+++ src/pawlib/paw/programs/Imakefile	2003-05-09 22:42:22.000000000 +0200
@@ -9,7 +9,7 @@
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
-#if defined(CERNLIB_LINUX)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_MACOSX)
 EXTRA_LDOPTIONS=-Wl,-E
 #endif
 
--- src/packlib/kuip/kuip/ksys.h.old	1997-09-02 10:50:01.000000000 -0400
+++ src/packlib/kuip/kuip/ksys.h	2003-08-10 11:49:38.000000000 -0400
@@ -184,7 +184,18 @@
 #  define HAVE_MEMMOVE
 #  define HAVE_STRCASECMP
 #  define HAVE_SELECT
-#  define MATCH_RE_COMP		/* use re_comp/re_exec */
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
+#endif
+
+
+#ifdef CERNLIB_MACOSX
+#  define MACOSX
+#  define MACHINE_NAME "MACOSX"
+#  define UNIX
+#  define HAVE_MEMMOVE
+#  define HAVE_STRCASECMP
+#  define HAVE_SELECT
+#  define MATCH_REGCOMP         /* use regcomp/regexec */
 #endif
 
 
--- src/pawlib/comis/code/csaddr.F.old	1996-02-26 12:16:25.000000000 -0500
+++ src/pawlib/comis/code/csaddr.F	2003-08-12 11:18:17.000000000 -0400
@@ -26,7 +26,12 @@
       I=CSLTGP(IPVS)
       IF(I.GT.0)THEN
         IF(IFCS.EQ.0)THEN
+c     thanks to Keisuke Fujii for this patch for OS X
+#if defined(CERNLIB_MACOSX)
+          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
           IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
           IF(IADGP.NE.0)THEN
             IFCS=-2
             CALL CSRTGP(I)
@@ -35,7 +40,11 @@
           ENDIF
         ENDIF
       ELSE
+#if defined(CERNLIB_MACOSX)
+        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
+#else
         IADGP=CS_GET_FUNC(NAME(1:NC)//'_')
+#endif
         IF(IADGP.NE.0)THEN
           IFCS=-2
           ITYPGP=-2


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cernlib.spec	18 Nov 2005 12:48:36 -0000	1.3
+++ cernlib.spec	18 Nov 2005 15:33:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.1
+Release:       4%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -110,6 +110,7 @@
 Patch42: cernlib-rsrtnt64_goto_outer_block.diff
 Patch43: cernlib-v107z0_X_before_string.diff
 Patch44: cernlib-bimsel-nodouble-save.diff
+Patch45: 029-fixes-for-MacOSX
 
 
 %description
@@ -258,6 +259,7 @@
 %patch -P 42
 %patch -P 43
 %patch -P 44
+%patch -P 45
 
 
 %build
@@ -429,6 +431,9 @@
 %doc debian/zftp.README.debian
 
 %changelog
+* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.2
+- add debian patch for MacOSX that should fix the PPC build
+
 * Tue Nov 15 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.1
 - add a .csh file
 - correct defaults in cernlib scripts

More information about the fedora-extras-commits mailing list