rpms/cernlib-g77/devel 315-fixes-for-MacOSX.dpatch, 1.2, 1.3 cernlib-304-update-Imake-config-files.dpatch, 1.3, 1.4 cernlib-321-support-gfortran.dpatch, 1.3, 1.4 cernlib-g77.spec, 1.11, 1.12
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Tue Mar 25 08:04:58 UTC 2008
- Previous message (by thread): rpms/m17n-contrib/F-8 m17n-contrib.spec,1.4,1.5
- Next message (by thread): rpms/Miro/devel sources, 1.7, 1.8 Miro.spec, 1.23, 1.24 Miro-xulrunner.patch, 1.2, 1.3 .cvsignore, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/cernlib-g77/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18263
Modified Files:
315-fixes-for-MacOSX.dpatch
cernlib-304-update-Imake-config-files.dpatch
cernlib-321-support-gfortran.dpatch cernlib-g77.spec
Log Message:
Sync patches.
Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 315-fixes-for-MacOSX.dpatch 13 Jan 2008 16:00:02 -0000 1.2
+++ 315-fixes-for-MacOSX.dpatch 25 Mar 2008 08:04:20 -0000 1.3
@@ -14,9 +14,9 @@
#ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
++SUBDIRS:= $(SUBDIRS) p5boot scripts
+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
+ SUBDIRS:= $(SUBDIRS) p5boot scripts mgr
#endif
+#endif
Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cernlib-304-update-Imake-config-files.dpatch 25 Feb 2008 08:33:58 -0000 1.3
+++ cernlib-304-update-Imake-config-files.dpatch 25 Mar 2008 08:04:20 -0000 1.4
@@ -9,14 +9,13 @@
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
--- cernlib-2006.dfsg.2~/src/config/Imake.cf 2006-09-15 02:34:47.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/Imake.cf 2008-01-11 09:52:56.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/Imake.cf 2008-03-12 09:57:41.000000000 -0700
@@ -1,27 +1,5 @@
-/* $Id$
- *
- * $Log$
-- * Revision 1.3 2008/02/25 08:33:58 pertusus
-- * * Sun Feb 24 2008 Patrice Dumas <pertusus at free.fr> 2006-25
-- * - new cernlib and paw patchsets
+- * Revision 1.4 2008/03/25 08:04:20 pertusus
+- * Sync patches.
- *
- * Revision 1.6 2006/09/15 09:34:47 mclareni
- * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -1464,7 +1463,7 @@
XCOMM WARNING: Imake.cf not configured; guessing at definitions!!!
diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
--- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf 2006-12-20 06:21:03.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf 2008-01-11 09:36:29.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf 2008-03-12 09:57:41.000000000 -0700
@@ -153,7 +153,7 @@
# define XargsCmd xargs
# define FortranSaveFlags -fno-automatic
@@ -1476,7 +1475,7 @@
diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
--- cernlib-2006.dfsg.2~/src/config/linux.cf 2006-09-15 02:34:48.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/linux.cf 2008-01-11 10:00:21.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux.cf 2008-03-12 09:58:59.000000000 -0700
@@ -68,20 +68,20 @@
#define OSVendor /**/
#define OSMajorVersion 2
@@ -1736,7 +1735,7 @@
+
+#ifdef MipsArchitecture
+# ifndef OptimizationLevel
-+# define OptimizationLevel -O3
++# define OptimizationLevel -O1
+# endif
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags OptimizationLevel
Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cernlib-321-support-gfortran.dpatch 25 Feb 2008 08:33:58 -0000 1.3
+++ cernlib-321-support-gfortran.dpatch 25 Mar 2008 08:04:20 -0000 1.4
@@ -4,13 +4,13 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Support compilation with gfortran. Patch thanks to Harald Vogt, plus:
## DP: - Extra hack to IOSTAT EOF return value to support gfortran-4.3.
-## DP: - Work around gfortran's refusal to initialize 4-byte integer with
-## DP: unsigned constant > 0x7fffffff.
+## DP: - Fix to patchy.car to change default fortran compiler in nyshell
+## DP: in gfortran case.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F 1996-04-01 07:01:53.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2008-03-13 09:40:04.000000000 -0700
@@ -45,7 +45,16 @@
MT=3
Z(1)=SQRT(SQRT(-D))
@@ -52,7 +52,7 @@
IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F 1996-04-01 07:02:54.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2008-03-13 09:40:04.000000000 -0700
@@ -14,10 +14,12 @@
VECTOR(I) = RNDM(I)
100 CONTINUE
@@ -70,7 +70,7 @@
END
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile 1999-11-15 05:25:58.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2008-03-13 09:40:04.000000000 -0700
@@ -13,7 +13,19 @@
#endif
@@ -93,7 +93,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2006-09-04 05:32:59.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2008-03-13 09:40:04.000000000 -0700
@@ -1,6 +1,6 @@
-SRCS_F= irndm.F qnext.F rdmin.F
@@ -105,7 +105,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 1969-12-31 16:00:00.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 2008-03-13 09:40:04.000000000 -0700
@@ -0,0 +1,19 @@
+* Wrapper GETARG routine for gfortran,
+* originally written by Harald Vogt <hvogt at ifh.de>
@@ -128,7 +128,7 @@
+
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h
--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h 2006-09-15 02:35:30.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h 2008-03-13 09:40:05.000000000 -0700
@@ -1031,7 +1031,7 @@
#if !defined(CERNLIB_GFORTRAN)
#define Getarg F77_NAME(getarg,GETARG)
@@ -140,7 +140,7 @@
#define Goparm F77_NAME(goparm,GOPARM)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc
--- cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc 2006-09-15 02:35:31.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc 2008-03-13 09:40:05.000000000 -0700
@@ -46,8 +46,12 @@
#elif defined(CERNLIB_WINDOWS)
* only valid for dec fortran (e.g. not f2c + microsoft c)
@@ -155,3 +155,38 @@
#elif 1
PARAMETER (IOSEOF = -1)
#endif
+diff -urNad cernlib-2006.dfsg.2~/src/patchy/fcasplit.F cernlib-2006.dfsg.2/src/patchy/fcasplit.F
+--- cernlib-2006.dfsg.2~/src/patchy/fcasplit.F 2008-03-13 09:39:39.000000000 -0700
++++ cernlib-2006.dfsg.2/src/patchy/fcasplit.F 2008-03-13 09:40:05.000000000 -0700
+@@ -352,7 +352,11 @@
+ PARAMETER (CHEXAS = '.s')
+ PARAMETER (CHEXOBJ = '.o')
+
++#if defined(CERNLIB_GFORTRAN)
++ PARAMETER (CHWHF = 'gfortran ')
++#else
+ PARAMETER (CHWHF = 'g77 ')
++#endif
+ PARAMETER (CHWHC = 'gcc ')
+ PARAMETER (CHWHA = 'as ')
+ #endif
+diff -urNad cernlib-2006.dfsg.2~/src/patchy/patchy.car cernlib-2006.dfsg.2/src/patchy/patchy.car
+--- cernlib-2006.dfsg.2~/src/patchy/patchy.car 2006-09-04 05:33:00.000000000 -0700
++++ cernlib-2006.dfsg.2/src/patchy/patchy.car 2008-03-13 09:41:01.000000000 -0700
+@@ -25968,10 +25968,14 @@
+ +SELF, IF=QMLNX.
+ CALL SMCIL (-1, 'fo:1' , '-O2')
+ CALL SMCIL (-1, 'fo:2' , '-O0')
+- CALL SMCIL (-1, 'fopt' , '-c -Nx800 -Nc200')
++ CALL SMCIL (-1, 'fopt' , '-c -g')
+ CALL SMCIL (-1, 'co:1' , '-O2')
+ CALL SMCIL (-1, 'co:2' , '-O0')
+- CALL SMCIL (-1, 'copt' , '-c -posix')
++ CALL SMCIL (-1, 'copt' , '-c -g')
++
+++SELF, IF=GFORTRAN.
++ CALL SMCIL (-1, 'fc' , 'gfortran')
++
+ +SELF, IF=QMNXT.
+ +SELF, IF=QMSGI.
+ +SELF, IF=QMSUN.
Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-g77.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cernlib-g77.spec 24 Mar 2008 23:55:35 -0000 1.11
+++ cernlib-g77.spec 25 Mar 2008 08:04:20 -0000 1.12
@@ -55,7 +55,7 @@
Name: %{?compat}cernlib%{?compiler}
Version: 2006
-Release: 28%{?dist}
+Release: 28%{?dist}.1
Summary: General purpose CERN library
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -1440,7 +1440,7 @@
%endif
%changelog
-* Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
+* Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28.1
- new cernlib, paw and geant321 debian patchesets
- use regular p5boot and patchy build
- Previous message (by thread): rpms/m17n-contrib/F-8 m17n-contrib.spec,1.4,1.5
- Next message (by thread): rpms/Miro/devel sources, 1.7, 1.8 Miro.spec, 1.23, 1.24 Miro-xulrunner.patch, 1.2, 1.3 .cvsignore, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list