rpms/cernlib-g77/devel cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch, NONE, 1.1 .cvsignore, 1.4, 1.5 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 700-remove-kernlib-from-packlib-Imakefile.dpatch, 1.1, 1.2 702-patch-Imakefiles-for-packlib-mathlib.dpatch, 1.1, 1.2 cernlib-102-dont-optimize-some-code.dpatch, 1.1, 1.2 cernlib-211-support-amd64-and-itanium.dpatch, 1.2, 1.3 cernlib-211-support-digital-alpha.dpatch, 1.1, 1.2 cernlib-303-shadow-passwords-supported.dpatch, 1.1, 1.2 cernlib-304-update-Imake-config-files.dpatch, 1.1, 1.2 cernlib-308-use-canonical-cfortran-location.dpatch, 1.1, 1.2 cernlib-321-support-gfortran.dpatch, 1.1, 1.2 cernlib-600-use-host.def-config-file.dpatch, 1.1, 1.2 cernlib-803-link-binaries-dynamically.dpatch, 1.2, 1.3 cernlib-807-static-link-some-tests-on-64-bit.dpatch, 1.1, 1.2 cernlib-g77.spec, 1.6, 1.7 sources, 1.4, 1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sun Jan 13 16:00:40 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/cernlib-g77/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9210
Modified Files:
.cvsignore 315-fixes-for-MacOSX.dpatch
700-remove-kernlib-from-packlib-Imakefile.dpatch
702-patch-Imakefiles-for-packlib-mathlib.dpatch
cernlib-102-dont-optimize-some-code.dpatch
cernlib-211-support-amd64-and-itanium.dpatch
cernlib-211-support-digital-alpha.dpatch
cernlib-303-shadow-passwords-supported.dpatch
cernlib-304-update-Imake-config-files.dpatch
cernlib-308-use-canonical-cfortran-location.dpatch
cernlib-321-support-gfortran.dpatch
cernlib-600-use-host.def-config-file.dpatch
cernlib-803-link-binaries-dynamically.dpatch
cernlib-807-static-link-some-tests-on-64-bit.dpatch
cernlib-g77.spec sources
Added Files:
cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
Log Message:
* Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
- new cernlib debian patcheset
--- NEW FILE cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 216-use-cernlib-gamma-not-intrinsic.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force use of mathlib gamma function in mathlib tests.
## DP: Built-in libc gamma function may not be sufficiently precise,
## DP: see, e.g., http://gcc.gnu.org/ml/fortran/2007-10/msg00096.html etc.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/bsja64.F 1996-04-01 07:02:08.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/bsja64.F 2008-01-09 16:06:48.000000000 -0800
@@ -21,9 +21,11 @@
#if defined(CERNLIB_DOUBLE)
PARAMETER (NAMEJ = 'BSJA/DBSJA',
1 NAMEI = 'BSIA/DBSIA')
+ EXTERNAL DGAMMA
#endif
#if !defined(CERNLIB_DOUBLE)
PARAMETER (NAMEJ = 'BSJA', NAMEI = 'BSIA')
+ EXTERNAL GAMMA
#endif
LOGICAL LJA,LIA,LEV,LER
DIMENSION B(0:*),BA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/cbsja64.F 1996-04-01 07:02:09.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/cbsja64.F 2008-01-09 16:08:36.000000000 -0800
@@ -21,9 +21,11 @@
CHARACTER NAME*(*)
#if defined(CERNLIB_DOUBLE)
PARAMETER (NAME = 'CBSJA/WBSJA')
+ EXTERNAL DGAMMA
#endif
#if !defined(CERNLIB_DOUBLE)
PARAMETER (NAME = 'CBSJA')
+ EXTERNAL GAMMA
#endif
LOGICAL LER
DIMENSION CB(0:*),CBA(0:100),RR(0:100)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rrizet64.F 1996-04-01 07:02:00.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rrizet64.F 2008-01-09 16:10:08.000000000 -0800
@@ -14,12 +14,14 @@
C
CHARACTER*(*) NAME
PARAMETER(NAME='RRIZET/DRIZET')
+ EXTERNAL DGAMMA
#endif
#if !defined(CERNLIB_DOUBLE)
FUNCTION RRIZET(X)
C
CHARACTER*(*) NAME
PARAMETER(NAME='RRIZET')
+ EXTERNAL GAMMA
#endif
C
DIMENSION P1(0:8),P2(0:8),P3(0:9),P4(0:8)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/g/gamdis.F 1996-04-01 07:02:43.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/g/gamdis.F 2008-01-09 16:11:13.000000000 -0800
@@ -28,6 +28,8 @@
PARAMETER (Z1 = 1, HALF = Z1/2, QUAR = Z1/4)
PARAMETER (C1 = 3*Z1/2, KMAX = 300)
+ EXTERNAL GAMMA
+
DATA C
1/ 0.5772157,-0.6558781,-0.0420026, 0.1665386,-0.0421977,
2 -0.0096220, 0.0072189,-0.0011652,-0.0002152, 0.0001281,
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/c302m.F 1996-04-01 07:01:13.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/c302m.F 2008-01-09 16:04:33.000000000 -0800
@@ -36,6 +36,7 @@
#include "gen/imp64.inc"
REAL GAMMA
+ EXTERNAL GAMMA, DGAMMA
CHARACTER*6 TFUNC(2)
#include "iorc.inc"
C
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/e408m.F 1998-11-05 02:41:34.000000000 -0800
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/e408m.F 2008-01-09 16:04:33.000000000 -0800
@@ -44,6 +44,12 @@
DATA TXT(2) /'EXP(-X**2) (-1 <= X <= 1) LUKE 3.2.2(8)'/
DATA TXT(3) /'J_1(X) (-1 <= X <= 1) LUKE 9.7(7)'/
+#if defined(CERNLIB_DOUBLE)
+ EXTERNAL DGAMMA
+#else
+ EXTERNAL GAMMA
+#endif
+
#if !defined(CERNLIB_WINNT) && !defined(CERNLIB_LINUX)
# if defined(CERNLIB_DOUBLE)
GVSUM(N,B,C) = DVSUM(N,B,C)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Jan 2008 23:55:38 -0000 1.4
+++ .cvsignore 13 Jan 2008 16:00:02 -0000 1.5
@@ -1,6 +1,6 @@
2006_src-free.tar.gz
+mclibs_2006.dfsg.2-3.diff.gz
+cernlib_2006.dfsg.2-6.diff.gz
patchy.tar.gz
geant321_3.21.14.dfsg-6.diff.gz
-mclibs_2006.dfsg.2-3.diff.gz
paw_2.14.04.dfsg.2-1.diff.gz
-cernlib_2006.dfsg.2-5.diff.gz
Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ 315-fixes-for-MacOSX.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -2,7 +2,7 @@
## 315-fixes-for-MacOSX.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch set (mostly due to Keisuke Fujii) to allow Cernlib to compile
+## DP: Patch set (mostly due to Keisuke Fujii) to allow CERNLIB to compile
## DP: and run on OS X.
@DPATCH@
Index: 700-remove-kernlib-from-packlib-Imakefile.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/700-remove-kernlib-from-packlib-Imakefile.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 700-remove-kernlib-from-packlib-Imakefile.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ 700-remove-kernlib-from-packlib-Imakefile.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -2,7 +2,7 @@
## 700-remove-kernlib-from-packlib-Imakefile.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch packlib Imakefile after moving kernlib out of tree.
@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile
Index: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/702-patch-Imakefiles-for-packlib-mathlib.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 702-patch-Imakefiles-for-packlib-mathlib.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ 702-patch-Imakefiles-for-packlib-mathlib.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -83,7 +83,7 @@
-LIBDIRS= gen bvsl
+LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
- /* Lapack is independent of Cernlib and should be installed as one of
+ /* Lapack is independent of CERNLIB and should be installed as one of
the build dependencies.
diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
--- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile 1969-12-31 19:00:00.000000000 -0500
Index: cernlib-102-dont-optimize-some-code.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-102-dont-optimize-some-code.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-102-dont-optimize-some-code.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-102-dont-optimize-some-code.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -6,9 +6,21 @@
## DP: (either compiler crash or broken code generation).
@DPATCH@
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/d/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 1996-06-12 11:25:38.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/d/Imakefile 2005-06-09 11:14:52.470486750 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/Imakefile 1999-09-24 07:27:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/Imakefile 2008-01-10 12:51:30.000000000 -0800
+@@ -117,3 +117,8 @@
+ SpecialFortranLibObjectRule(nzerfz64,nzerfz64,-O,NullParameter)
+ SpecialFortranLibObjectRule(wclbes,wclbes,-O,NullParameter)
+ #endif
++
++#if defined(CERNLIB_GFORTRAN) && ! defined(CERNLIB_IBM)
++/* -O3 optimization causes minor floating point inaccuracies in gfortran 4.2 */
++SpecialFortranLibObjectRule(gamma64,gamma64,-O0,NullParameter)
++#endif
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/d/Imakefile 1996-06-12 08:25:38.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/d/Imakefile 2008-01-10 12:44:29.000000000 -0800
@@ -19,6 +19,11 @@
SRCS_F:= $(SRCS_F) cgauss64.F dgquad.F dgset.F gauss64.F minfc64.F \ @@\
rcauch.F rdeqbs.F rdeqmr.F rderiv.F rfrdh1.F rgmlt.F rkstp64.F \ @@\
@@ -38,9 +50,9 @@
FORTRANSAVEOPTION = FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/mathlib/gen/e/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile
---- cernlib-2005.05.09/src/mathlib/gen/e/Imakefile 1996-05-01 09:21:54.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/mathlib/gen/e/Imakefile 2005-06-09 11:16:07.058731880 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/e/Imakefile 1996-05-01 06:21:54.000000000 -0700
++++ cernlib-2006.dfsg.2/src/mathlib/gen/e/Imakefile 2008-01-10 12:44:29.000000000 -0800
@@ -12,6 +12,11 @@
#if defined(CERNLIB_DOUBLE)
@@ -53,9 +65,9 @@
#else
SRCS_F:= $(SRCS_F) chsum128.F rchebn.F rcspln128.F
#endif
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile 1996-06-10 06:20:57.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/c204fort/Imakefile 2005-06-09 11:09:34.621022534 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/c204fort/Imakefile 1996-06-10 03:20:57.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/c204fort/Imakefile 2008-01-10 12:44:29.000000000 -0800
@@ -14,6 +14,11 @@
FDEBUGFLAGS=+O1
#endif
@@ -68,9 +80,9 @@
FORTRANSAVEOPTION = FortranSaveFlags
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile
---- cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile 1996-06-12 06:04:36.000000000 -0400
-+++ /tmp/dpep.hNz5sX/cernlib-2005.05.09/src/packlib/kernlib/kernnum/g900fort/Imakefile 2005-06-09 11:10:40.068274255 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/g900fort/Imakefile 1996-06-12 03:04:36.000000000 -0700
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/g900fort/Imakefile 2008-01-10 12:44:29.000000000 -0800
@@ -4,6 +4,11 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
Index: cernlib-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-211-support-amd64-and-itanium.dpatch 9 Jan 2008 23:55:38 -0000 1.2
+++ cernlib-211-support-amd64-and-itanium.dpatch 13 Jan 2008 16:00:02 -0000 1.3
@@ -2,7 +2,7 @@
## 211-support-amd64-and-itanium.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Large patch from Harald Vogt <hvogt at ifh.de> to make Cernlib work better
+## DP: Large patch from Harald Vogt <hvogt at ifh.de> to make CERNLIB work better
## DP: (at least when statically linked) on 64-bit architectures.
## DP: Slightly modified in an attempt to keep ABI compatibility of the
## DP: dynamic libraries; not that it matters much as they don't work well
@@ -490,9 +490,9 @@
+ * $Id$
+ *
+ * $Log$
-+ * Revision 1.2 2008/01/09 23:55:38 pertusus
-+ * * Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
-+ * - new debian patchesets
++ * Revision 1.3 2008/01/13 16:00:02 pertusus
++ * * Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
++ * - new cernlib debian patcheset
+ *
+ * Revision 1.1.1.1 1996/02/15 17:49:32 mclareni
+ * Kernlib
@@ -581,9 +581,9 @@
+ * $Id$
+ *
+ * $Log$
-+ * Revision 1.2 2008/01/09 23:55:38 pertusus
-+ * * Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
-+ * - new debian patchesets
++ * Revision 1.3 2008/01/13 16:00:02 pertusus
++ * * Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
++ * - new cernlib debian patcheset
+ *
+ * Revision 1.1.1.1 1996/02/15 17:49:32 mclareni
+ * Kernlib
Index: cernlib-211-support-digital-alpha.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-211-support-digital-alpha.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-digital-alpha.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-211-support-digital-alpha.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -27,7 +27,7 @@
if ( jadr != 0x6000000000000000) {
+#elif defined (__alpha__)
+ if ( jadr != 0x0000000100000000) {
-+#else /* amd64 */
++#else /* amd64 or ppc64 */
+ if ( jadr != 0) {
#endif
fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
Index: cernlib-303-shadow-passwords-supported.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-303-shadow-passwords-supported.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-303-shadow-passwords-supported.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-303-shadow-passwords-supported.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -2,7 +2,7 @@
## 303-shadow-passwords-supported.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow Cern's server code to read from /etc/shadow.
+## DP: Allow CERN's server code to read from /etc/shadow.
@DPATCH@
diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-304-update-Imake-config-files.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-304-update-Imake-config-files.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -3,19 +3,20 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use Imake.cf stolen from recent XFree86 code, as it is much more
-## DP: up-to-date than the Imake.cf in Cernlib source. Also update linux.cf
+## DP: up-to-date than the Imake.cf in CERNLIB source. Also update linux.cf
## DP: to support most Linux architectures.
@DPATCH@
-diff -urNad cernlib-2006.dfsg~/src/config/Imake.cf cernlib-2006.dfsg/src/config/Imake.cf
---- cernlib-2006.dfsg~/src/config/Imake.cf 2006-09-15 05:34:47.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/Imake.cf 2007-01-09 19:03:04.701920749 -0500
-@@ -1,27 +1,10 @@
+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
+@@ -1,27 +1,5 @@
-/* $Id$
- *
- * $Log$
-- * Revision 1.1 2007/08/05 09:41:49 pertusus
-- * initial import
+- * Revision 1.2 2008/01/13 16:00:02 pertusus
+- * * Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
+- * - new cernlib debian patcheset
- *
- * 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
@@ -36,22 +37,46 @@
- * X11R6 config files unmodified
- *
- *
-+/* This is the Imake.cf file stolen from XFree86 4.3.0, patched for Debian
-+ (version 4.3.0.dfsg.1-4). It is a major improvement (several years ahead)
-+ of the Imake.cf file originally packed with Cernlib.
-+ -- Kevin McCarty, for Debian
- */
+- */
-XCOMM $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
-+
++XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $
+XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
/*
* To add support for another platform:
*
-@@ -40,184 +23,358 @@
+@@ -40,257 +18,586 @@
*
* 4. Create a .cf file with the name given by MacroFile.
*/
-+XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
++XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+
+-#ifdef ultrix
+-#define MacroIncludeFile <ultrix.cf>
+-#define MacroFile ultrix.cf
+-#ifdef vax
+-#undef vax
+-#define VaxArchitecture
+-#endif
+-#ifdef mips
+-#undef mips
+-#define MipsArchitecture
++#if defined(__APPLE__)
++# undef __APPLE__
++# define MacroIncludeFile <MacOSX.cf>
++# define MacroFile MacOSX.cf
++# define MacOSXArchitecture
++# define DarwinArchitecture
++# ifdef __ppc__
++# define PpcDarwinArchitecture
++# undef __ppc__
++# endif
++# ifdef __i386__
++# define i386DarwinArchitecture
++# undef __i386__
++# endif
+ #endif
+-#undef ultrix
+-#define UltrixArchitecture
+
+#if defined(clipper) || defined(__clipper__)
+# undef clipper
@@ -73,20 +98,8 @@
+#undef _X86_
+#undef __CYGWIN__
+#endif /* CYGWIN */
-
- #ifdef ultrix
--#define MacroIncludeFile <ultrix.cf>
--#define MacroFile ultrix.cf
--#ifdef vax
--#undef vax
--#define VaxArchitecture
--#endif
--#ifdef mips
--#undef mips
--#define MipsArchitecture
--#endif
--#undef ultrix
--#define UltrixArchitecture
++
++#ifdef ultrix
+# define MacroIncludeFile <ultrix.cf>
+# define MacroFile ultrix.cf
+# ifdef vax
@@ -102,12 +115,13 @@
+# define UltrixArchitecture
#endif /* ultrix */
- #if defined(vax) && !defined(UltrixArchitecture)
+-#if defined(vax) && !defined(UltrixArchitecture)
-#define MacroIncludeFile <bsd.cf>
-#define MacroFile bsd.cf
-#undef vax
-#define BSDArchitecture
-#define VaxArchitecture
++#if defined(vax) && !defined(UltrixArchitecture) && !defined(__OpenBSD__)
+# define MacroIncludeFile <bsd.cf>
+# define MacroFile bsd.cf
+# undef vax
@@ -115,16 +129,20 @@
+# define VaxArchitecture
#endif /* vax */
- #ifdef bsdi
+-#ifdef bsdi
-#define MacroIncludeFile <bsdi.cf>
-#define MacroFile bsdi.cf
-#undef bsdi
-#define BSD386Architecture
-#define i386BsdArchitecture
-#define i386Architecture
++#ifdef __bsdi__
+# define MacroIncludeFile <bsdi.cf>
+# define MacroFile bsdi.cf
-+# undef bsdi
++# undef __bsdi__
++# ifdef bsdi
++# undef bsdi
++# endif
+# define BSDOSArchitecture
+# if defined(__i386__) || defined(i386)
+# define i386BsdArchitecture
@@ -132,7 +150,14 @@
+# undef i386
+# undef __i386__
+# endif
++# if defined(__ppc__) || defined(ppc)
++# define PpcBsdArchitecture
++# define PpcArchitecture
++# undef ppc
++# undef __ppc__
++# endif
+# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
++# define SparcBsdArchitecture
+# define SparcArchitecture
+# undef sparc
+# undef __sparc__
@@ -140,10 +165,23 @@
+# endif
#endif /* bsdi */
+-#ifdef __NetBSD__
+-#define MacroIncludeFile <NetBSD.cf>
+-#define MacroFile NetBSD.cf
+-#undef __NetBSD__
+-#define NetBSDArchitecture
+-#ifdef __i386__
+-#define i386BsdArchitecture
+-#define i386Architecture
+-#endif
+-#if defined(__sparc__) || defined(sparc)
+-#define SparcArchitecture
+-#undef sparc
+#ifdef __OpenBSD__
+# undef __OpenBSD__
+# undef __NetBSD__
+# define OpenBSDArchitecture
++# define KOpenBSDArchitecture
+# define MacroIncludeFile <OpenBSD.cf>
+# define MacroFile OpenBSD.cf
+# ifdef __i386__
@@ -159,7 +197,7 @@
+# endif
+# undef sparc
+# endif
-+# ifdef mips
++# if defined(__mips__) || defined(mips)
+# define MipsArchitecture
+# ifdef arc
+# define ArcArchitecture
@@ -176,7 +214,13 @@
+# undef __alpha__
+# undef alpha
+# endif
-+# ifdef mc68020
++# if defined(__amd64__) || defined(__x86_64__)
++# define AMD64Architecture
++# undef __amd64__
++# undef __x86_64__
++# undef amd64
++# endif
++# if defined(__mc68020__) || defined(mc68020)
+# define Mc68020Architecture
+# if defined(amiga)
+# define AmigaArchitecture
@@ -201,30 +245,35 @@
+# undef mc68000
+# endif
+# ifdef __powerpc__
-+# define PPCArchitecture
++# define PpcArchitecture
+# undef __powerpc__
+# undef __macppc__
+# undef macppc
+# endif
++# ifdef __vax__
++# undef vax
++# undef __vax__
++# define VaxArchitecture
++# endif
++# ifdef __hppa__
++# ifndef HPArchitecture
++# define HPArchitecture
++# endif
++# undef __hppa__
++# endif /* __hppa__ */
+#endif /* OpenBSD */
+
- #ifdef __NetBSD__
--#define MacroIncludeFile <NetBSD.cf>
--#define MacroFile NetBSD.cf
--#undef __NetBSD__
--#define NetBSDArchitecture
--#ifdef __i386__
--#define i386BsdArchitecture
--#define i386Architecture
--#endif
--#if defined(__sparc__) || defined(sparc)
--#define SparcArchitecture
--#undef sparc
--#endif
++/* Systems based on kernel of OpenBSD */
++#if defined(__OpenBSD_kernel__)
++#define KOpenBSDArchitecture
+ #endif
++
++#ifdef __NetBSD__
+# define MacroIncludeFile <NetBSD.cf>
+# define MacroFile NetBSD.cf
+# undef __NetBSD__
+# define NetBSDArchitecture
++# define KNetBSDArchitecture
+# ifdef __i386__
+# define i386BsdArchitecture
+# define i386Architecture
@@ -262,7 +311,7 @@
+# undef __vax__
+# endif
+# ifdef __powerpc__
-+# define PPCArchitecture
++# define PpcArchitecture
+# undef __powerpc__
+# endif
#endif /* NetBSD */
@@ -275,17 +324,44 @@
-#ifdef __i386__
-#define i386BsdArchitecture
-#define i386Architecture
-+#ifdef __GNU_FreeBSD__
-+#define MacroIncludeFile <gnu-freebsd.cf>
-+#define MacroFile gnu-freebsd.cf
-+#define GNUFreeBSDArchitecture
++/* Systems based on kernel of NetBSD */
++#if defined(__NetBSD_kernel__)
++#define KNetBSDArchitecture
#endif
+
++#ifdef __DragonFly__
++# define MacroIncludeFile <DragonFly.cf>
++# define MacroFile DragonFly.cf
++# undef __DragonFly__
++# undef __FreeBSD__
++# define DragonFlyArchitecture
++# define FreeBSDArchitecture
++# ifdef __i386__
++# define i386BsdArchitecture
++# define i386Architecture
++# undef i386
++# endif
++# ifdef __sparc64__
++# define Sparc64Architecture
++# undef __sparc64__
++# endif
++# ifdef __ia64__
++# define ia64Architecture
++# undef __ia64__
++# endif
++# ifdef __amd64__
++# define x86_64Architecture
++# undef __amd64__
++# undef __x86_64__
++# endif
++#endif /* __DragonFly__ */
++
+#ifdef __FreeBSD__
+# define MacroIncludeFile <FreeBSD.cf>
+# define MacroFile FreeBSD.cf
+# undef __FreeBSD__
+# define FreeBSDArchitecture
++# define KFreeBSDArchitecture
+# ifdef __i386__
+# define i386BsdArchitecture
+# define i386Architecture
@@ -300,9 +376,22 @@
+# define Sparc64Architecture
+# undef __sparc64__
+# endif
++# ifdef __ia64__
++# define ia64Architecture
++# undef __ia64__
++# endif
++# ifdef __amd64__
++# define AMD64Architecture
++# undef __amd64__
++# undef __x86_64__
++# endif
++# ifdef __powerpc__
++# define PpcArchitecture
++# undef __powerpc__
++# endif
#endif /* __FreeBSD__ */
- #ifdef AMOEBA
+-#ifdef AMOEBA
-/* Should be before the 'sun' entry because we may be cross-compiling */
-#define MacroIncludeFile <Amoeba.cf>
-#define MacroFile Amoeba.cf
@@ -318,11 +407,16 @@
-#define SunArchitecture
-#endif
-#endif
--#endif
++/* Systems based on kernel of FreeBSD */
++#if defined(__FreeBSD_kernel__)
++#define KFreeBSDArchitecture
+ #endif
-#undef i80386
-#undef mc68000
-#undef sparc
-#undef sun
++
++#ifdef AMOEBA
+ /* Should be before the 'sun' entry because we may be cross-compiling */
+# define MacroIncludeFile <Amoeba.cf>
+# define MacroFile Amoeba.cf
@@ -374,11 +468,22 @@
+# endif
+# ifdef sparc
+# undef sparc
-+# define SparcArchitecture
++# define SparcArchitecture
++# endif
++# ifdef __sparcv9
++# undef __sparcv9
++# define Sparc64Architecture
+# endif
+# ifdef mc68000
+# undef mc68000
-+# define Sun3Architecture
++# define Sun3Architecture
++# endif
++# if defined(__amd64) || defined(__x86_64)
++# undef __amd64
++# undef __x86_64
++# undef amd64
++# undef i386
++# define AMD64Architecture
+# endif
+# ifdef i386
+# undef i386
@@ -399,9 +504,18 @@
+# define HPArchitecture
#endif /* hpux */
-+#ifdef sco
+-#ifdef USL
+-#define MacroIncludeFile <usl.cf>
+-#define MacroFile usl.cf
+-#undef USL
+-#undef SVR4
+-#define SVR4Architecture
+-#define i386Architecture
+-#endif /* USL */
++#ifdef __SCO__
+# define MacroIncludeFile <sco5.cf>
+# define MacroFile sco5.cf
++# undef __SCO__
+# undef sco
+# undef USL
+# undef SYSV
@@ -414,24 +528,60 @@
+# define SVR3Architecture
+# define i386ScoArchitecture
+# define i386Sco325Architecture
-+#endif /* sco - SCO Open Server 5 */
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __SCO__ - SCO Open Server 5 */
+
- #ifdef USL
--#define MacroIncludeFile <usl.cf>
--#define MacroFile usl.cf
--#undef USL
--#undef SVR4
--#define SVR4Architecture
--#define i386Architecture
++#ifdef __UNIXWARE__
+# define MacroIncludeFile <usl.cf>
+# define MacroFile usl.cf
++# undef __UNIXWARE__
+# undef USL
+# undef SVR4
+# undef i386
++# undef SVR5
++# undef SYSV5
+# define SVR4Architecture
+# define i386Architecture
+# define USLArchitecture
- #endif /* USL */
++# define UnixWareArchitecture
++# undef i386
++# undef i486
++# undef i586
++# undef i686
++# undef k6
++# undef __i386__
++# undef __i486__
++# undef __i586__
++# undef __i686__
++# undef __k6__
++# undef __i386
++# undef __i486
++# undef __i586
++# undef __i686
++# undef __k6
++# undef pentium
++# undef __pentium
++# undef pentiumpro
++# undef __pentiumpro
++#endif /* __UNIXWARE__ */
#ifdef NCR
-#define MacroIncludeFile <ncr.cf>
@@ -539,21 +689,13 @@
+# define MacIIArchitecture
#endif /* macII */
- #ifdef __APPLE__
-@@ -225,72 +382,89 @@
- # define MacroFile MacOSX.cf
- # define MacOSXArchitecture
- # define DarwinArchitecture
-+# ifdef __ppc__
-+# define PpcDarwinArchitecture
-+# undef __ppc__
-+# endif
-+# ifdef __i386__
-+# define i386DarwinArchitecture
-+# undef __i386__
-+# endif
- #endif
-
+-#ifdef __APPLE__
+-# define MacroIncludeFile <MacOSX.cf>
+-# define MacroFile MacOSX.cf
+-# define MacOSXArchitecture
+-# define DarwinArchitecture
+-#endif
+-
#ifdef _CRAY
-#define MacroIncludeFile <cray.cf>
-#define MacroFile cray.cf
@@ -651,7 +793,11 @@
+# endif
+# ifdef _IBMR2
+# undef _IBMR2
-+# define RsArchitecture
++# if (DefaultOSMajorVersion < 5)
++# define RsArchitecture
++# else
++# define PpcArchitecture
++# endif
+# endif
#endif /* ibm */
@@ -681,7 +827,7 @@
#endif /* luna */
#ifdef Mips
-@@ -317,9 +491,14 @@
+@@ -317,9 +624,14 @@
# endif
#endif /* MOTOROLA */
@@ -697,7 +843,7 @@
# endif
# define SVR4Architecture
# define MacroIncludeFile <svr4.cf>
-@@ -329,13 +508,42 @@
+@@ -329,13 +641,42 @@
#ifdef SYSV
# ifdef i386
@@ -744,7 +890,7 @@
# ifdef SVR4
# define i386Architecture
# define SVR4Architecture
-@@ -343,18 +551,46 @@
+@@ -343,18 +684,46 @@
# define MacroIncludeFile <svr4.cf>
# define MacroFile svr4.cf
# undef SVR4
@@ -800,7 +946,7 @@
#endif /* DGUX */
#ifdef __convex__
-@@ -366,101 +602,405 @@
+@@ -366,101 +735,446 @@
# define ConvexArchitecture
#endif /* _convex_ */
@@ -847,16 +993,17 @@
+# undef SVR4
#endif /* Oki */
- #ifdef WIN32
+-#ifdef WIN32
-#define MacroIncludeFile <Win32.cf>
-#define MacroFile Win32.cf
-#define Win32Architecture
++#if defined(WIN32) && !defined(__GNUC__)
+# define MacroIncludeFile <Win32.cf>
+# define MacroFile Win32.cf
+# define Win32Architecture
#endif /* WIN32 */
- #ifdef linux
+-#ifdef linux
-#ifdef PPC
-#define MacroIncludeFile <linux-pmac.cf>
-#define MacroFile linux-pmac.cf
@@ -875,12 +1022,33 @@
-#define MacroFile linux.cf
-#undef linux
-#define LinuxArchitecture
--#define i386Architecture
++#if defined(WIN32) && defined(__GNUC__)
++#define MacroIncludeFile <mingw.cf>
++#define MacroFile mingw.cf
++#define Win32Architecture
++#define mingwArchitecture
+ #define i386Architecture
-#endif
+-#endif /* linux */
++#undef i386
++#undef i486
++#undef i586
++#undef i686
++#undef __i386__
++#undef _X86_
++#undef __MINGW32__
++#endif /* CYGWIN */
++
++#if defined(linux) || defined(__GLIBC__)
+# define MacroIncludeFile <linux.cf>
+# define MacroFile linux.cf
+# undef linux
-+# define LinuxArchitecture
++# ifdef __linux__
++# define LinuxArchitecture
++# endif
++# ifdef __GLIBC__
++# define GNUArchitecture
++# endif
+# ifdef i386
+# ifndef i386Architecture
+# define i386Architecture
@@ -997,21 +1165,31 @@
+# undef arm
+# undef __arm
+# undef __arm__
++# if defined(__ARMEB__)
++# define Arm32ebArchitecture
++# endif
++# undef __ARMEB__
+# endif
+# ifdef mc68000
+# define Mc68020Architecture
+# undef mc68000
+# endif /* mc68000 */
-+# ifdef powerpc
-+# define PPCArchitecture
++# if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
++# define PpcArchitecture
+# undef powerpc
+# endif
-+# ifdef __powerpc__
-+# ifndef PPCArchitecture
-+# define PPCArchitecture
++# if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
++# ifndef PpcArchitecture
++# define PpcArchitecture
+# endif
+# undef __powerpc__
+# endif
++# ifdef __powerpc64__
++# ifndef Ppc64Architecture
++# define Ppc64Architecture
++# endif
++# undef __powerpc64__
++# endif
+# ifdef sparc
+# define SparcArchitecture
+# undef sparc
@@ -1080,25 +1258,27 @@
+# undef __SH4__
+# endif /* __SH4__ */
+/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
+# define PowerPCArchitecture
+# endif
+# if defined(__s390x__)
+# define s390xArchitecture
+# undef __s390x__
+# endif
-+# if defined(__x86_64__)
++# if defined(__amd64__) || defined (__x86_64__)
++# undef __amd64__
+# undef __x86_64__
-+# define x86_64Architecture
++# define AMD64Architecture
+# endif
-+# if defined(x86_64__)
++# if defined(amd64__) || defined (x86_64__)
++# undef amd64__
+# undef x86_64__
-+# ifndef x86_64Architecture
-+# define x86_64Architecture
++# ifndef AMD64Architecture
++# define AMD64Architecture
+# endif
+# endif
- #endif /* linux */
-
++#endif /* linux || __GLIBC__ */
++
+#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+# define MacroIncludeFile <lynx.cf>
+# define MacroFile lynx.cf
@@ -1113,7 +1293,7 @@
+# undef __x86__
+# endif
+# ifdef __powerpc__
-+# define PPCArchitecture
++# define PpcArchitecture
+# undef __powerpc__
+# endif
+# if defined(sparc) || defined(__sparc__)
@@ -1122,11 +1302,11 @@
+# undef __sparc__
+# endif
+/* for compatibility with 3.3.x */
-+# ifdef PPCArchitecture
++# ifdef PpcArchitecture
+# define PowerPCArchitecture
+# endif
+#endif /* LynxOS AT/PPC/microSPARC */
-+
+
#ifdef __uxp__
-#define MacroIncludeFile <fujitsu.cf>
-#define MacroFile fujitsu.cf
@@ -1188,10 +1368,7 @@
+# define MacroIncludeFile <nec.cf>
+# define MacroFile nec.cf
+# define NecArchitecture
- #endif
--#define MacroIncludeFile <nec.cf>
--#define MacroFile nec.cf
--#define NecArchitecture
++#endif
+
+#ifdef minix
+#define MacroIncludeFile <minix.cf>
@@ -1201,15 +1378,27 @@
+#define i386Architecture
+#endif /* minix */
+
-+#ifdef MACH
-+#ifdef __GNU__
++/* Systems with GNU libc and userland */
++#if defined(__GNU__)
++#define GNUArchitecture
+#define MacroIncludeFile <gnu.cf>
+#define MacroFile gnu.cf
++#ifdef __i386__
++#define i386Architecture
+ #endif
+-#define MacroIncludeFile <nec.cf>
+-#define MacroFile nec.cf
+-#define NecArchitecture
+ #endif
+
++#ifdef MACH
++#ifdef __GNU__
++/* Mach-based GNU system */
+#define GNUMachArchitecture
+#else
+#define MacroIncludeFile <mach.cf>
+#define MacroFile mach.cf
- #endif
++#endif
+#undef MACH
+#ifdef i386
+#define i386MachArchitecture
@@ -1217,7 +1406,7 @@
+#endif /* i386 */
+#undef i386
+#endif /* MACH */
-
++
+/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
+ * it sees a test using the `unix' symbol */
+#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
@@ -1273,9 +1462,21 @@
#ifndef MacroIncludeFile
XCOMM WARNING: Imake.cf not configured; guessing at definitions!!!
-diff -urNad cernlib-2006.dfsg~/src/config/linux.cf cernlib-2006.dfsg/src/config/linux.cf
---- cernlib-2006.dfsg~/src/config/linux.cf 2006-09-15 05:34:48.000000000 -0400
-+++ cernlib-2006.dfsg/src/config/linux.cf 2007-01-09 19:17:01.559270079 -0500
+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
+@@ -153,7 +153,7 @@
+ # define XargsCmd xargs
+ # define FortranSaveFlags -fno-automatic
+ # define OptimisedFortranFlags -O0 -g -funroll-loops -fomit-frame-pointer
+-# define DefaultFCOptions -fno-second-underscore
++# define DefaultFCOptions -fno-automatic -fno-second-underscore
+ # define NoOpFortranDebugFlags -O0
+ # define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN -DCERNLIB_QMLXIA64
+
+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
@@ -68,20 +68,20 @@
#define OSVendor /**/
#define OSMajorVersion 2
@@ -1301,7 +1502,7 @@
#endif
#define HasPutenv YES
#define HasShm YES
-@@ -97,38 +97,302 @@
+@@ -97,38 +97,307 @@
#define NeedVarargsPrototypes YES
#define NeedWidePrototypes NO
@@ -1372,11 +1573,11 @@
+ Debian patched (version 4.3.0.dfsg.1-4), plus additional
+ OptimizationLevel macro.
+
-+ Additional Cernlib-specific per-architecture flags also added.
++ Additional CERNLIB-specific per-architecture flags also added.
+ --Kevin McCarty */
+
+/* Note: we are now using CERNLIB_PPC as an endianness test (which is about
-+ all that the Cernlib source uses it for); I introduced a new define
++ all that the CERNLIB source uses it for); I introduced a new define
+ CERNLIB_POWERPC for the three occasions when we specifically want to
+ test for powerpc chips.
+*/
@@ -1478,7 +1679,7 @@
+# endif
+# define DefaultCCOptions -malign-int
+# define DefaultFCOptions -malign-int -fno-automatic \
-+ -fno-second-underscore -fugly-complex
++ -fno-second-underscore
+# define LinuxMachineDefines -D__mc68000__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
@@ -1488,7 +1689,7 @@
+/* # define PositionIndependentCplusplusFlags -fpic */
+#endif /* Mc68020Architecture */
+
-+#ifdef PPCArchitecture
++#if defined(PpcArchitecture) || defined(Ppc64Architecture)
+# define DefaultCCOptions -fsigned-char
+# ifndef OptimizationLevel
+# define OptimizationLevel -O3
@@ -1498,11 +1699,18 @@
+# endif
+# define LinuxMachineDefines -D__powerpc__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+# define CernlibMachineDefines -DCERNLIB_PPC -DCERNLIB_POWERPC
++# ifdef Ppc64Architecture
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++# define CernlibMachineDefines -DCERNLIB_PPC -DCERNLIB_POWERPC \
++ -DCERNLIB_QMLXIA64
++# define CERNLIB_QMLXIA64
++# else
++# define CernlibMachineDefines -DCERNLIB_PPC -DCERNLIB_POWERPC
++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
++# endif
+# define CERNLIB_PPC
+# define CERNLIB_POWERPC
-+#endif /* PPCArchitecture */
++#endif /* PpcArchitecture || Ppc64Architecture */
+
+#ifdef SparcArchitecture
+# ifndef OptimizationLevel
@@ -1584,7 +1792,7 @@
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+#endif
+
-+#ifdef x86_64Architecture
++#ifdef AMD64Architecture
+# ifndef OptimizationLevel
+# define OptimizationLevel -O3
+# endif
@@ -1592,13 +1800,11 @@
+# define OptimizedCDebugFlags OptimizationLevel
+# endif
+# define LinuxMachineDefines -D__x86_64__
-+# define DefaultFCOptions -fno-automatic \
-+ -fno-second-underscore -fugly-complex
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+# define CernlibMachineDefines -DCERNLIB_QMLXIA64
+# define CERNLIB_QMLXIA64
-+#endif /* x86_64Architecture */
++#endif /* AMD64Architecture */
+
+#ifndef StandardDefines
+# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
@@ -1618,7 +1824,7 @@
/* Some of these man page defaults are overriden in the above OS sections */
#ifndef ManSuffix
# define ManSuffix 1x
-@@ -163,7 +427,7 @@
+@@ -163,7 +432,7 @@
#define FortranSaveFlags /* */ /* Everything static !? */
#define OptimisedFortranFlags -g -pc 64 -tp p6
#define DefaultFCOptions -Msave -fpic -Kieee
@@ -1627,7 +1833,7 @@
#else
-@@ -174,19 +438,18 @@
+@@ -174,19 +443,18 @@
# undef StandardDefines
# undef NeedFunctionPrototypes
# undef NeedWidePrototypes
@@ -1659,7 +1865,7 @@
#else
-@@ -197,19 +460,18 @@
+@@ -197,19 +465,18 @@
# undef StandardDefines
# undef NeedFunctionPrototypes
# undef NeedWidePrototypes
@@ -1691,7 +1897,7 @@
/*
* Create a Make Variable to allow building with/out Motif
*/
-@@ -222,25 +484,28 @@
+@@ -222,25 +489,30 @@
#else
# ifdef Hasgfortran
@@ -1719,9 +1925,12 @@
# define XargsCmd xargs
# define FortranSaveFlags -fno-automatic
-# define OptimisedFortranFlags -O0 -g -funroll-loops -fomit-frame-pointer
+-# define DefaultFCOptions -fno-second-underscore
+# define OptimisedFortranFlags OptimizedCDebugFlags -funroll-loops
+/* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
- # define DefaultFCOptions -fno-second-underscore
++# ifndef DefaultFCOptions
++# define DefaultFCOptions -fno-automatic -fno-second-underscore
++# endif
# define NoOpFortranDebugFlags -O0
-# define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_GFORTRAN
+# define CernlibSystem CernlibDefaultDefines CernlibMachineDefines \
@@ -1729,7 +1938,7 @@
#define CERNLIB_GFORTRAN
-@@ -249,17 +514,32 @@
+@@ -249,17 +521,32 @@
/* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
/* Adapted to CERN style GF. 20-Sep-96 */
@@ -1765,7 +1974,7 @@
# endif
# endif
-@@ -280,7 +560,7 @@
+@@ -280,7 +567,7 @@
/*
* Create a Make Variable to allow building with/out Motif
*/
Index: cernlib-308-use-canonical-cfortran-location.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-308-use-canonical-cfortran-location.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-308-use-canonical-cfortran-location.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-308-use-canonical-cfortran-location.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -2,7 +2,7 @@
## 308-use-canonical-cfortran-location.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: All code compiled at Cernlib build-time should look for cfortran.h
+## DP: All code compiled at CERNLIB build-time should look for cfortran.h
## DP: at <cfortran/cfortran.h>.
@DPATCH@
Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-321-support-gfortran.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-321-support-gfortran.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -7,7 +7,7 @@
@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 10:01:53.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2007-04-21 19:45:12.000000000 -0400
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2007-08-08 13:52:08.000000000 -0400
@@ -45,7 +45,16 @@
MT=3
Z(1)=SQRT(SQRT(-D))
@@ -49,7 +49,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 10:02:54.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2007-04-21 19:45:12.000000000 -0400
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2007-08-08 13:52:08.000000000 -0400
@@ -14,10 +14,12 @@
VECTOR(I) = RNDM(I)
100 CONTINUE
@@ -67,7 +67,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 08:25:58.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2007-04-21 19:45:12.000000000 -0400
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2007-08-08 13:52:08.000000000 -0400
@@ -13,7 +13,19 @@
#endif
@@ -90,32 +90,32 @@
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 08:32:59.000000000 -0400
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2007-04-21 19:45:41.000000000 -0400
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2007-08-08 13:52:08.000000000 -0400
@@ -1,6 +1,6 @@
-SRCS_F= irndm.F qnext.F rdmin.F
-+SRCS_F= irndm.F qnext.F rdmin.F getarg.F
++SRCS_F= irndm.F qnext.F rdmin.F kernlibgetarg.F
-SRCS_C= lshift.c ishftr.c getarg.c
+SRCS_C= lshift.c ishftr.c /* getarg.c */
SubdirLibraryTarget(NullParameter,NullParameter)
-diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F
---- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F 2007-04-21 19:48:39.000000000 -0400
+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 19:00:00.000000000 -0500
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 2007-08-08 13:53:38.000000000 -0400
@@ -0,0 +1,19 @@
+* Wrapper GETARG routine for gfortran,
+* originally written by Harald Vogt <hvogt at ifh.de>
+*
-+ SUBROUTINE GETARG (JARG, CHARG)
++* SUBROUTINE GETARG (JARG, CHARG)
+* The following stuff is required to use gfortrans inline routine GETARG
+* It is required to avoid the calling GETARG here which conflicts
+* to the Fortran rules
-+ CHARACTER CHARG*(*)
-+ CALL MYGETARG (JARG, CHARG)
-+ END
++* CHARACTER CHARG*(*)
++* CALL MYGETARG (JARG, CHARG)
++* END
+
-+ SUBROUTINE MYGETARG (JARG, CHARG)
++ SUBROUTINE KERNLIBGETARG (JARG, CHARG)
+ CHARACTER CHARG*(*)
+* gfortran translates the following line to a call
+* to its library routine _gfortran_getarg_i4
@@ -123,3 +123,15 @@
+ CALL GETARG (JARG, CHARG)
+ END
+
+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 05:35:30.000000000 -0400
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h 2007-08-08 13:54:14.000000000 -0400
+@@ -1031,7 +1031,7 @@
+ #if !defined(CERNLIB_GFORTRAN)
+ #define Getarg F77_NAME(getarg,GETARG)
+ #else
+-#define Getarg _gfortran_getarg_i4
++#define Getarg F77_NAME(kernlibgetarg,KERNLIBGETARG)
+ #endif
+ extern SUBROUTINE Getarg;
+ #define Goparm F77_NAME(goparm,GOPARM)
Index: cernlib-600-use-host.def-config-file.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-600-use-host.def-config-file.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-600-use-host.def-config-file.dpatch 5 Aug 2007 09:41:49 -0000 1.1
+++ cernlib-600-use-host.def-config-file.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -2,7 +2,7 @@
## 600-use-host.def-config-file.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use host.def for Debian-specific CERNLIB build options.
@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/site.def cernlib-2005.05.09.dfsg/src/config/site.def
Index: cernlib-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-803-link-binaries-dynamically.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-803-link-binaries-dynamically.dpatch 9 Jan 2008 23:55:38 -0000 1.2
+++ cernlib-803-link-binaries-dynamically.dpatch 13 Jan 2008 16:00:02 -0000 1.3
@@ -2,7 +2,7 @@
## 803-link-binaries-dynamically.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link binaries dynamically against Cern libraries.
+## DP: Link binaries dynamically against CERN libraries.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/fortran.rules cernlib-2006.dfsg.2/src/config/fortran.rules
Index: cernlib-807-static-link-some-tests-on-64-bit.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-807-static-link-some-tests-on-64-bit.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-807-static-link-some-tests-on-64-bit.dpatch 9 Jan 2008 23:55:38 -0000 1.1
+++ cernlib-807-static-link-some-tests-on-64-bit.dpatch 13 Jan 2008 16:00:02 -0000 1.2
@@ -3,7 +3,7 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Statically link certain test programs against CERN libraries on
-## DP: 64-bit systems, since Cernlib's memory management is hopelessly
+## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
## DP: broken there.
@DPATCH@
Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/cernlib-g77.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib-g77.spec 9 Jan 2008 23:55:38 -0000 1.6
+++ cernlib-g77.spec 13 Jan 2008 16:00:02 -0000 1.7
@@ -55,7 +55,7 @@
Name: %{?compat}cernlib%{?compiler}
Version: 2006
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: General purpose CERN library
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,7 +138,7 @@
Source204: cernlib-debian-copyright.in
# debian patchsets
-Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-5.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-6.diff.gz
Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-3.diff.gz
Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-6.diff.gz
@@ -215,7 +215,9 @@
Patch21302: geant321-213-fix-test-suite-build.dpatch
Patch21303: mclibs-213-fix-test-suite-build.dpatch
Patch214: cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch
-Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
+# not in latest debian cernlib and doesn't seems to be useful on fedora
+#Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
+Patch216: cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
# Use another approach, see cernlib-enforce-FHS
# Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -612,7 +614,8 @@
%patch -P 21302 -p1
%patch -P 21303 -p1
%patch -P 214 -p1
-%patch -P 215 -p1
+#%patch -P 215 -p1
+%patch -P 216 -p1
%patch -P 300 -p1
#%patch -P 301 -p1
#%patch -P 302 -p1
@@ -848,7 +851,7 @@
# use the debian cernlib script for dynamic libraries support.
# remove -lg2c to the link commands, because libg2c.so isn't available,
-# it is found by g77/gfortran if needed.
+# it is found by g77/gfortran if needed, and similar with -lgfortran.
# don't add %{_libdir} to the directory searched in for libraries,
# since it is already in the list.
sed -e 's:@PREFIX@:%{_prefix}:g' \
@@ -856,6 +859,7 @@
-e 's:@VERSION@:%{verdir}:g' \
-e 's:@LIBPREFIX@::g' \
-e 's/-lg2c//' \
+ -e 's/-lgfortran//' \
../cernlib.in > src/scripts/cernlib
# to remove reference to monolithic X directories
# -e 's/-L\$XDIR\(64\)\? //' \
@@ -1189,14 +1193,6 @@
if [ -f __dist_failed_builds ]; then
echo "DIST TESTS FAILED"
cat __dist_failed_builds
-# non 64 bit arches should always succeed
-%ifnarch x86_64 ppc64
-exit 1
-%endif
-# g77 should always succeed
-%if ! %{with gfortran}
-exit 1
-%endif
fi
@@ -1430,6 +1426,9 @@
%endif
%changelog
+* Sun Jan 13 2008 Patrice Dumas <pertusus at free.fr> 2006-23
+- new cernlib debian patcheset
+
* Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
- new debian patchesets
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 9 Jan 2008 23:55:38 -0000 1.4
+++ sources 13 Jan 2008 16:00:02 -0000 1.5
@@ -1,6 +1,6 @@
fe71a3f6b95ff2151c5a4690116a0358 2006_src-free.tar.gz
+0e109009d1bdbd056ac30401957f8487 mclibs_2006.dfsg.2-3.diff.gz
+9ee6ad9c139f8c8e190b8dca7f078cc7 cernlib_2006.dfsg.2-6.diff.gz
b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz
43e1ec7ab19b55d9de065c01ca4c3182 geant321_3.21.14.dfsg-6.diff.gz
-0e109009d1bdbd056ac30401957f8487 mclibs_2006.dfsg.2-3.diff.gz
90982e80623338cf2d4b4a9efb445f8c paw_2.14.04.dfsg.2-1.diff.gz
-e0532ec3a8b5f0124679d7e07b3bcb1a cernlib_2006.dfsg.2-5.diff.gz
More information about the fedora-extras-commits
mailing list