rpms/cernlib/devel cernlib-212-print-test-results.dpatch, NONE, 1.1 cernlib-213-fix-test-suite-build.dpatch, NONE, 1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE, 1.1 cernlib-215-work-around-g77-bug-on-ia64.dpatch, NONE, 1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 geant321-213-fix-test-suite-build.dpatch, NONE, 1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 mclibs-213-fix-test-suite-build.dpatch, NONE, 1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 .cvsignore, 1.7, 1.8 cernlib-211-support-amd64-and-itanium.dpatch, 1.1, 1.2 cernlib-803-link-binaries-dynamically.dpatch, 1.2, 1.3 cernlib.spec, 1.65, 1.66 geant321-001-fix-missing-fluka.dpatch, 1.2, 1.3 mclibs-321-support-gfortran.dpatch, 1.1, 1.2 sources, 1.8, 1.9 cernlib-64test.patch, 1.6, NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Jan 9 23:56:05 UTC 2008
- Previous message (by thread): rpms/dnssec-tools/F-8 dnssec-tools.spec,1.8,1.9
- Next message (by thread): rpms/cernlib-g77/devel cernlib-212-print-test-results.dpatch, NONE, 1.1 cernlib-213-fix-test-suite-build.dpatch, NONE, 1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE, 1.1 cernlib-215-work-around-g77-bug-on-ia64.dpatch, NONE, 1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 geant321-213-fix-test-suite-build.dpatch, NONE, 1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 mclibs-213-fix-test-suite-build.dpatch, NONE, 1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 .cvsignore, 1.3, 1.4 cernlib-211-support-amd64-and-itanium.dpatch, 1.1, 1.2 cernlib-803-link-binaries-dynamically.dpatch, 1.1, 1.2 cernlib-g77.spec, 1.5, 1.6 geant321-001-fix-missing-fluka.dpatch, 1.1, 1.2 mclibs-321-support-gfortran.dpatch, 1.1, 1.2 sources, 1.3, 1.4 cernlib-64test.patch, 1.1, NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9354
Modified Files:
.cvsignore cernlib-211-support-amd64-and-itanium.dpatch
cernlib-803-link-binaries-dynamically.dpatch cernlib.spec
geant321-001-fix-missing-fluka.dpatch
mclibs-321-support-gfortran.dpatch sources
Added Files:
cernlib-212-print-test-results.dpatch
cernlib-213-fix-test-suite-build.dpatch
cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch
cernlib-215-work-around-g77-bug-on-ia64.dpatch
cernlib-807-static-link-some-tests-on-64-bit.dpatch
geant321-213-fix-test-suite-build.dpatch
geant321-807-static-link-some-tests-on-64-bit.dpatch
mclibs-213-fix-test-suite-build.dpatch
mclibs-807-static-link-some-tests-on-64-bit.dpatch
Removed Files:
cernlib-64test.patch cernlib-segf_eudtest.patch
cernlib-test.patch
Log Message:
* Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
- new debian patchesets
--- NEW FILE cernlib-212-print-test-results.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 212-print-test-results.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Explicitly output test program exit codes.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.rules cernlib-2006.dfsg.2/src/config/Imake.rules
--- cernlib-2006.dfsg.2~/src/config/Imake.rules 2005-04-18 15:39:25.000000000 +0000
+++ cernlib-2006.dfsg.2/src/config/Imake.rules 2007-12-13 18:52:12.000000000 +0000
@@ -2373,13 +2373,15 @@
test:: ProgramTargetName(program) data inputdata @@\
@echo Testing $(PACKAGE_NAME) @@\
@echo " ... using" program @@\
- @Concat(.,$(PATHSEP))ProgramTargetName(program) @@\
+ @Concat(.,$(PATHSEP))ProgramTargetName(program) ; \ @@\
+ result="$$?" ; echo "Test result = $$result" ; exit "$$result" @@\
@@\
else @@\
test:: ProgramTargetName(program) data inputdata @@\
@echo Testing $(PACKAGE_NAME) @@\
@echo " ... using" program @@\
- @Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata @@\
+ @Concat(.,$(PATHSEP))ProgramTargetName(program) < inputdata ; \ @@\
+ result="$$?" ; echo "Test result = $$result" ; exit "$$result" @@\
@@\
endif @@\
@@\
--- NEW FILE cernlib-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/bvsl/test/Imakefile 1996-03-21 17:19:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/bvsl/test/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -6,7 +6,7 @@
DefinePackageLibrary(bvsltst)
-CernlibFortranProgramTarget(bvslt,tsbvsl.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(bvslt,tsbvsl.o,libbvsltst.a,libbvsltst.a,mathlib kernlib)
TestTarget(bvslt,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/mathlib/gen/tests/Imakefile 2005-03-24 16:40:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/mathlib/gen/tests/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -63,7 +63,7 @@
DefinePackageLibrary(gentest)
-CernlibFortranProgramTarget(gent,main.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(gent,main.o,libgentest.a,libgentest.a,packlib mathlib)
TestTarget(gent,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest1/Imakefile 1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest1/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -11,9 +11,9 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
-CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest1_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
TestTarget(ptest1_32,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest2/Imakefile 1996-03-08 15:21:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest2/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -10,9 +10,9 @@
SpecialFortranObjectRule(main_32,main,NullParameter,-DCERNLIB_PH32BIT)
SpecialFortranObjectRule(test2_32,test2,NullParameter,-DCERNLIB_PH32BIT)
-CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
-CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest2_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
TestTarget(ptest2_32,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/epio/tests/ptest3/Imakefile 1996-03-08 15:21:46.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/epio/tests/ptest3/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -12,9 +12,9 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_16,$(OBJS_16) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
-CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ptest3_32,$(OBJS_32) $(OBJS_CO),NullParameter,NullParameter,kernlib packlib)
TestTarget(ptest3_32,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile 1996-10-02 15:36:27.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -2,7 +2,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(ffread,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
TestTarget(ffread,NullParameter,test.input)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile 1996-02-20 15:46:21.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -5,11 +5,11 @@
DefinePackageLibrary(hbtlib)
-CernlibFortranProgramTarget(hbtest,hexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
-CernlibFortranProgramTarget(hbdiff,htdiffb.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
-CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(hmerge,hmerg.o hmergin.o,libhbtlib.a,libhbtlib.a,mathlib)
TestTarget(hbtest,NullParameter,NullParameter)
TestTarget(hbdiff,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/tests/Imakefile 1996-02-20 15:46:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/tests/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -1,6 +1,6 @@
#if 0
/* this is not yet understood */
-CernlibFortranProgramTarget(hbtest,test_fp.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(hbtest,test_fp.o,NullParameter,NullParameter,packlib)
TestTarget(hbtest)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kapack/test/Imakefile 1996-12-02 15:29:51.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kapack/test/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -1,7 +1,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(kapack,test1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(kapack,test1.o,NullParameter,NullParameter,kernlib packlib)
/* the kapack test, or better kamake asks for a file name only in unix.
* on VMS, the file is opened on unit 11, resulting in for011.dat
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile 1996-10-02 15:37:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -5,7 +5,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(ktest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib kernlib)
+CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
TestTarget(ktest,NullParameter,ktest.inp)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/minuit/examples/Imakefile 1997-10-23 17:04:15.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/minuit/examples/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -9,6 +9,6 @@
FDEBUGFLAGS=NoOpFortranDebugFlags
#endif
-CernlibFortranProgramTarget(minuit,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(minuit,$(OBJS),NullParameter,NullParameter,packlib)
TestTarget(minuit,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile 1996-03-12 08:13:30.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -5,6 +5,6 @@
SubdirLibraryTarget(zbookt,NullParameter)
-CernlibFortranProgramTarget(zexam,zexam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile 1997-08-29 13:33:57.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile 2007-12-14 00:14:11.000000000 +0000
@@ -41,27 +41,27 @@
testrz: zebrz1 zebrz2 zebrz3
-CernlibFortranProgramTarget(zebmz1,zebmz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
-CernlibFortranProgramTarget(zebfz1,zebfz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz2,zebfz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz3,zebfz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz4,zebfz4.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz5,zebfz5.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz6,zebfz6.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz7,zebfz7.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz8,zebfz8.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfz9,zebfz9.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz2,zebfz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz3,zebfz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz4,zebfz4.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz5,zebfz5.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz6,zebfz6.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz7,zebfz7.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz8,zebfz8.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfz9,zebfz9.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
-CernlibFortranProgramTarget(zebfc1,zebfc1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc2,zebfc2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebfc3,zebfc3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebfc1,zebfc1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc2,zebfc2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebfc3,zebfc3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
-CernlibFortranProgramTarget(zebjz1,zebjz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebjz1,zebjz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
-CernlibFortranProgramTarget(zebrz1,zebrz1.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz2,zebrz2.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
-CernlibFortranProgramTarget(zebrz3,zebrz3.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(zebrz1,zebrz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz2,zebrz2.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
+CernlibFortranProgramTarget(zebrz3,zebrz3.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
TestTarget(zebmz1,zxtest.dat,NullParameter)
--- NEW FILE cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 214-fix-kernnum-funcs-on-64-bit.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Attempt to fix kernnum use of pointer differences on 64-bit arches.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cxj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cxj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JX = (IADDR(X2) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/cyj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/cyj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/czj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/czj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dxj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dxj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JX = (IADDR(X2) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dyj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dyj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/dzj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/dzj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rxj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rxj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JX = (IADDR(X2) - IADDR(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/ryj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/ryj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f002fort/rzj.inc 1996-02-15 17:48:50.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f002fort/rzj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cdi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cdi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
ID = (IADDR(D2) - IADDR(D)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ ID = IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cujk.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cujk.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
JU = (IADDR(U12) - IADDR(U)) / 8
KU = (IADDR(U22) - IADDR(U)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JU = IPTRDIFF(U12, U) / 8
+ KU = IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IX = (IADDR(X2) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cxij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cxij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IX = (IADDR(X21) - IADDR(X)) / 8
JX = (IADDR(X12) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X21, X) / 8
+ JX = IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IY = (IADDR(Y21) - IADDR(Y)) / 8
JY = (IADDR(Y12) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IY = IPTRDIFF(Y21, Y) / 8
+ JY = IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/cyj.inc 1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/cyj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czi.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IZ = (IADDR(Z21) - IADDR(Z)) / 8
JZ = (IADDR(Z12) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z21, Z) / 8
+ JZ = IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/czj.inc 1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/czj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ddi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ddi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
ID = (IADDR(D2) - IADDR(D)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ ID = IPTRDIFF(D2, D) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dujk.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dujk.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
JU = (IADDR(U12) - IADDR(U)) / 8
KU = (IADDR(U22) - IADDR(U)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JU = IPTRDIFF(U12, U) / 8
+ KU = IPTRDIFF(U22, U) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IX = (IADDR(X2) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X2, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dxij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dxij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IX = (IADDR(X21) - IADDR(X)) / 8
JX = (IADDR(X12) - IADDR(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X21, X) / 8
+ JX = IPTRDIFF(X12, X) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IY = (IADDR(Y21) - IADDR(Y)) / 8
JY = (IADDR(Y12) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IY = IPTRDIFF(Y21, Y) / 8
+ JY = IPTRDIFF(Y12, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dyj.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dyj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzi.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IZ = (IADDR(Z21) - IADDR(Z)) / 8
JZ = (IADDR(Z12) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z21, Z) / 8
+ JZ = IPTRDIFF(Z12, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/dzj.inc 1996-02-15 17:48:56.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/dzj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rdi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rdi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
ID = (IADDR(D2) - IADDR(D)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ ID = IPTRDIFF(D2, D) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rujk.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rujk.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
JU = (IADDR(U12) - IADDR(U)) / 4
KU = (IADDR(U22) - IADDR(U)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JU = IPTRDIFF(U12, U) / 4
+ KU = IPTRDIFF(U22, U) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IX = (IADDR(X2) - IADDR(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X2, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rxij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rxij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IX = (IADDR(X21) - IADDR(X)) / 4
JX = (IADDR(X12) - IADDR(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IX = IPTRDIFF(X21, X) / 4
+ JX = IPTRDIFF(X12, X) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IY = (IADDR(Y21) - IADDR(Y)) / 4
JY = (IADDR(Y12) - IADDR(Y)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IY = IPTRDIFF(Y21, Y) / 4
+ JY = IPTRDIFF(Y12, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/ryj.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/ryj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JY = (IADDR(Y2) - IADDR(Y)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzi.inc 1996-02-15 17:48:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzi.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
IZ = (IADDR(Z2) - IADDR(Z)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzij.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzij.inc 2008-01-02 20:02:31.000000000 +0000
@@ -25,3 +25,7 @@
IZ = (IADDR(Z21) - IADDR(Z)) / 4
JZ = (IADDR(Z12) - IADDR(Z)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IZ = IPTRDIFF(Z21, Z) / 4
+ JZ = IPTRDIFF(Z12, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f003fort/rzj.inc 1996-02-15 17:48:55.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f003fort/rzj.inc 2008-01-02 20:02:31.000000000 +0000
@@ -21,3 +21,6 @@
#if defined(CERNLIB_NUMIB1)
JZ = (IADDR(Z2) - IADDR(Z)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JZ = IPTRDIFF(Z2, Z) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/dlocf.inc 1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/dlocf.inc 2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
IZ = (IADDR(Z21(1)) - LOCZ) / 8
LZ = (IADDR(Z12(1)) - LOCZ) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ IF(MIN0(M,N,K) .LE. 0) RETURN
+ IX = IPTRDIFF(X21(1), X(1)) / 8
+ JX = IPTRDIFF(X12(1), X(1)) / 8
+ JY = IPTRDIFF(Y21(1), Y(1)) / 8
+ LY = IPTRDIFF(Y12(1), Y(1)) / 8
+ IZ = IPTRDIFF(Z21(1), Z(1)) / 8
+ LZ = IPTRDIFF(Z12(1), Z(1)) / 8
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/rlocf.inc 1996-02-15 17:49:00.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/rlocf.inc 2008-01-02 20:02:31.000000000 +0000
@@ -57,3 +57,12 @@
IZ = (IADDR(Z21(1)) - LOCZ) / 4
LZ = (IADDR(Z12(1)) - LOCZ) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ IF(MIN0(M,N,K) .LE. 0) RETURN
+ IX = IPTRDIFF(X21(1), X(1)) / 4
+ JX = IPTRDIFF(X12(1), X(1)) / 4
+ JY = IPTRDIFF(Y21(1), Y(1)) / 4
+ LY = IPTRDIFF(Y12(1), Y(1)) / 4
+ IZ = IPTRDIFF(Z21(1), Z(1)) / 4
+ LZ = IPTRDIFF(Z12(1), Z(1)) / 4
+#endif
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/f004fort/zisxy.inc 1996-02-15 17:49:01.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/f004fort/zisxy.inc 2008-01-02 20:02:31.000000000 +0000
@@ -9,9 +9,15 @@
*
* zisxy.inc
*
+#ifdef CERNLIB_NUM64
+ IF(IPTRSAME(Z(1), X(1)) .EQ. 1) GOTO 30
+ IF(IPTRSAME(Z(1), Y(1)) .EQ. 1) GOTO 40
+ IF(IPTRSAME(X(1), Y(1)) .EQ. 1) GOTO 20
+#else
IF(LOCZ .EQ. LOCX) GOTO 30
IF(LOCZ .EQ. LOCY) GOTO 40
IF(LOCX .EQ. LOCY) GOTO 20
+#endif
10 LY1L = 1
LZ1L = 1
DO 13 L = 1, K
@@ -68,7 +74,11 @@
LZII = LZII + IZ + LZ
24 CONTINUE
RETURN
+#ifdef CERNLIB_NUM64
+ 30 IF(IPTRSAME(X(1), Y(1)) .EQ. 1) GOTO 50
+#else
30 IF(LOCX .EQ. LOCY) GOTO 50
+#endif
LXI1 = 1
DO 34 I = 1, M
LY1L = 1
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/kernnum/pilot.h 1997-02-04 17:36:48.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/kernnum/pilot.h 2008-01-02 20:02:31.000000000 +0000
@@ -19,7 +19,7 @@
#endif
#endif
-#if defined(CERNLIB_LINUX)||defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
+#if defined(CERNLIB_LINUX) && !defined(CERNLIB_QMLXIA64) || defined(CERNLIB_MSDOS) && !defined(CERNLIB_WINNT)
#ifndef CERNLIB_NUMIB2
#define CERNLIB_NUMIB2
#endif
@@ -31,6 +31,18 @@
#endif
#endif
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#ifdef CERNLIB_NUMD38
+#undef CERNLIB_NUMD38
+#endif
+#ifndef CERNLIB_NUMD279
+#define CERNLIB_NUMD279
+#endif
+#endif
+
#if defined(CERNLIB_VAXVMS)
#ifndef CERNLIB_NUMDE
#define CERNLIB_NUMDE
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h 1997-02-04 17:36:54.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/kernnumt/pilot.h 2008-01-02 20:02:31.000000000 +0000
@@ -44,6 +44,11 @@
#ifndef CERNLIB_NUMLN
#define CERNLIB_NUMLN
#endif
+#if defined(CERNLIB_QMLXIA64)
+#ifndef CERNLIB_NUM64
+#define CERNLIB_NUM64
+#endif
+#endif
#endif
#if defined(CERNLIB_MSDOS)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F 1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/cvdist.F 2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
IF(N .LE. 0) RETURN
CVDIST = DISTF(X(1),Y(1))
IF(N .LE. 1) RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
JY = (LOCF(Y2) - LOCF(Y)) / 2
#endif
@@ -26,6 +26,10 @@
JX = (%LOC(X2) - %LOC(X)) / 8
JY = (%LOC(Y2) - %LOC(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
LX = 1
LY = 1
DO 10 J = 2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F 1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/dvdist.F 2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
IF(N .LE. 0) RETURN
DVDIST = DISTF(X(1),Y(1))
IF(N .LE. 1) RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
JY = (LOCF(Y2) - LOCF(Y)) / 2
#endif
@@ -26,6 +26,10 @@
JX = (%LOC(X2) - %LOC(X)) / 8
JY = (%LOC(Y2) - %LOC(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
LX = 1
LY = 1
DO 10 J = 2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F 1996-02-15 17:48:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk0/rvdist.F 2008-01-02 20:02:31.000000000 +0000
@@ -14,7 +14,7 @@
IF(N .LE. 0) RETURN
RVDIST = DISTF(X(1),Y(1))
IF(N .LE. 1) RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = LOCF(X2) - LOCF(X)
JY = LOCF(Y2) - LOCF(Y)
#endif
@@ -26,6 +26,10 @@
JX = (%LOC(X2) - %LOC(X)) / 4
JY = (%LOC(Y2) - %LOC(Y)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 4
+ JY = IPTRDIFF(Y2, Y) / 4
+#endif
LX = 1
LY = 1
DO 10 J = 2, N
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/check3.F 1996-03-21 17:16:07.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/check3.F 2008-01-02 20:02:31.000000000 +0000
@@ -343,7 +343,7 @@
I = 1
IF(N .EQ. 1) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = LOCF(X2) - LOCF(X)
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -352,6 +352,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 4
+#endif
DO 10 J = 2, N
LXJ = LXJ + JX
T = ABSF(X(LXJ))
@@ -373,7 +376,7 @@
I = 1
IF(N .EQ. 1) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -382,6 +385,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
DO 10 J = 2, N
LXJ = LXJ + JX
T = ABSF(X(LXJ))
@@ -403,7 +409,7 @@
I = 1
IF(N .EQ. 1) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
DO 10 J = 2, N
LXJ = LXJ + JX
T = ABSF(X(LXJ))
@@ -441,7 +450,7 @@
RVSUMA = 0.
IF(N .LE. 0) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = LOCF(X2) - LOCF(X)
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -450,6 +459,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 4
+#endif
DO 10 J = 1, N
RVSUMA = RVSUMA + ABS(X(LXJ))
LXJ = LXJ + JX
@@ -461,7 +473,7 @@
DVSUMA = 0.
IF(N .LE. 0) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -470,6 +482,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
DO 10 J = 1, N
DVSUMA = DVSUMA + ABS(SNGL(X(LXJ)))
LXJ = LXJ + JX
@@ -481,7 +496,7 @@
CVSUMA = 0.
IF(N .LE. 0) RETURN
LXJ = 1
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = (LOCF(X2) - LOCF(X)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -490,6 +505,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 8
+#endif
DO 10 J = 1, N
CVSUMA = CVSUMA + AMAX1(ABS(REAL(X(LXJ))),ABS(AIMAG(X(LXJ))))
LXJ = LXJ + JX
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F 1996-03-21 17:16:08.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f002ch.F 2008-01-02 20:02:31.000000000 +0000
@@ -329,7 +329,7 @@
IF(.NOT. OK) WRITE(IOUNIT,1000) N, IFAIL
IF(N .LE. 0) RETURN
KFAIL = IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JY = LOCF(Y2) - LOCF(Y)
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -338,6 +338,9 @@
#if defined(CERNLIB_NUMDE)
JY = (%LOC(Y2) - %LOC(Y)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 4
+#endif
LY = (KFAIL - 1)*JY + 1
S = Y(LY)
Y(LY) = ZERO
@@ -366,7 +369,7 @@
IF(.NOT. OK) WRITE(IOUNIT,1000) N, IFAIL
IF(N .LE. 0) RETURN
KFAIL = IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JY = (LOCF(Y2) - LOCF(Y)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -375,6 +378,9 @@
#if defined(CERNLIB_NUMDE)
JY = (%LOC(Y2) - %LOC(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
LY = (KFAIL - 1)*JY + 1
S = Y(LY)
Y(LY) = ZERO
@@ -403,7 +409,7 @@
IF(.NOT. OK) WRITE(IOUNIT,1000) N, IFAIL
IF(N .LE. 0) RETURN
KFAIL = IRANF(1,N)
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JY = (LOCF(Y2) - LOCF(Y)) / 2
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -412,6 +418,9 @@
#if defined(CERNLIB_NUMDE)
JY = (%LOC(Y2) - %LOC(Y)) / 8
#endif
+#if defined(CERNLIB_NUM64)
+ JY = IPTRDIFF(Y2, Y) / 8
+#endif
LY = (KFAIL - 1)*JY + 1
S = Y(LY)
Y(LY) = ZERO
@@ -1139,7 +1148,7 @@
XS2 = ZERO
XM2 = ZERO
IF(N .LE. 0) RETURN
-#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))
+#if (!defined(CERNLIB_NUMUC))&&(!defined(CERNLIB_NUMCR))&&(!defined(CERNLIB_NUMDE))&&(!defined(CERNLIB_NUM64))
JX = LOCF(X2) - LOCF(X)
#endif
#if defined(CERNLIB_NUMUC)||defined(CERNLIB_NUMCR)
@@ -1148,6 +1157,9 @@
#if defined(CERNLIB_NUMDE)
JX = (%LOC(X2) - %LOC(X)) / 4
#endif
+#if defined(CERNLIB_NUM64)
+ JX = IPTRDIFF(X2, X) / 4
+#endif
LX = 1
S1 = ZERO
S2 = ZERO
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F 1996-03-21 17:16:10.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f011ch.F 2008-01-02 20:03:24.000000000 +0000
@@ -251,7 +251,8 @@
+ 3X,7H IDIM =,I5, 3X, 4H E =,1PE12.3)
END
SUBROUTINE TSING(N,A,R,OK,FACT,SETEX,RABS,VXCH)
- REAL A(*), R(*), DET(2)
+ REAL A(*), R(*)
+ DOUBLE PRECISION DET(2)
LOGICAL OK, OKDET
#include "kernnumt/sysdat.inc"
#include "ch3dat.inc"
--- NEW FILE cernlib-215-work-around-g77-bug-on-ia64.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 215-work-around-g77-bug-on-ia64.dpatch by <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Work around what appears to be a g77 compiler bug on ia64 in test suite.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f004ch.F cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f004ch.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kernnum/test/numchk3/f004ch.F 1996-02-15 17:48:45.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kernnum/test/numchk3/f004ch.F 2008-01-03 01:55:33.000000000 +0000
@@ -438,7 +438,7 @@
+ MMPY,MRAN,MSCL,MSUB,VDIST,VMAXA,VSET)
REAL A(*), B(*), C(*), T(*), GA(*), GB(*), GC(*)
REAL FMONE(2), ALPHA(2), BETA(2)
- LOGICAL OK, OKA, OKL, OKT
+ LOGICAL OK, OKA, OKL, OKT, OKTMP
REAL E, R0, RES
EXTERNAL VDIST, VSET
#include "kernnumt/sysdat.inc"
@@ -523,7 +523,8 @@
+ CALL CHECKL(0,0,C,LG,GC,LC,LC12,LC21,OKT,VDIST,VSET)
IF(.NOT. OKT)
+ WRITE(IOUNIT,1011) ISUB,M,N,K,JCNFG,LC,LC12,LC21
- OKL = OKL .AND. OKT
+ OKTMP = OKL .AND. OKT
+ OKL = OKTMP
19 CONTINUE
OK = OK .AND. OKA .AND. OKL
20 CONTINUE
--- NEW FILE cernlib-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by <kmccarty at debian.org>
##
## 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: broken there.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/ffread/test/Imakefile 2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/ffread/test/Imakefile 2007-12-17 17:53:50.000000000 +0000
@@ -2,7 +2,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#else
CernlibFortranProgramTarget(ffread,$(OBJS),NullParameter,NullParameter,kernlib packlib)
+#endif
TestTarget(ffread,NullParameter,test.input)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/examples/Imakefile 2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/hbook/examples/Imakefile 2007-12-17 17:55:51.000000000 +0000
@@ -5,6 +5,12 @@
DefinePackageLibrary(hbtlib)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+ CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
CernlibFortranProgramTarget(hbtest,hexam.o,libhbtlib.a,libhbtlib.a,packlib)
CernlibFortranProgramTarget(hbdiff,htdiffb.o,libhbtlib.a,libhbtlib.a,mathlib)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kuip/examples/Imakefile 2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/kuip/examples/Imakefile 2007-12-17 17:53:50.000000000 +0000
@@ -5,7 +5,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#else
CernlibFortranProgramTarget(ktest,$(OBJS),NullParameter,NullParameter,graflib packlib kernlib)
+#endif
TestTarget(ktest,NullParameter,ktest.inp)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zbook/test/Imakefile 2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zbook/test/Imakefile 2007-12-17 17:53:50.000000000 +0000
@@ -5,6 +5,10 @@
SubdirLibraryTarget(zbookt,NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#else
CernlibFortranProgramTarget(zexam,zexam.o,libzbookt.a,libzbookt.a,packlib)
+#endif
TestTarget(zexam,NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/Imakefile 2007-12-17 17:53:41.000000000 +0000
+++ cernlib-2006.dfsg.2/src/packlib/zebra/test/Imakefile 2007-12-17 17:53:50.000000000 +0000
@@ -41,6 +41,12 @@
testrz: zebrz1 zebrz2 zebrz3
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+#undef CernlibFortranProgramTarget
+#define CernlibFortranProgramTarget(a,b,c,d,e) \
+ CernlibFortranStaticTarget(a,b,c,d,e)
+#endif
+
CernlibFortranProgramTarget(zebmz1,zebmz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
CernlibFortranProgramTarget(zebfz1,zebfz1.o,libzebtlib.a,libzebtlib.a,kernlib packlib)
--- NEW FILE geant321-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.
@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile 1997-04-10 08:33:14.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile 2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(exam1,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
TestTarget(exam1,gexam1.dat,gexam1.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile 1997-04-10 08:33:20.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile 2008-01-04 17:03:52.000000000 -0800
@@ -13,7 +13,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(exam2,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
TestTarget(exam2,gexam2.dat,gexam2.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile 1997-04-10 08:33:34.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile 2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(exam3,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
TestTarget(exam3,gexam3.dat,gexam3.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile 1997-04-10 08:33:37.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile 2008-01-04 17:03:52.000000000 -0800
@@ -14,7 +14,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(exam4,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
TestTarget(exam4,gexam4.dat,gexam4.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile 1997-04-10 08:33:38.000000000 -0700
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile 2008-01-04 17:03:52.000000000 -0800
@@ -3,7 +3,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(exam5,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),graflib packlib)
+CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
TestTarget(exam5,gexam5.dat,gexam5.input)
--- NEW FILE geant321-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## 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: broken there.
@DPATCH@
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam1/Imakefile 2008-01-04 17:05:50.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam1/Imakefile 2008-01-04 17:10:09.000000000 -0800
@@ -3,7 +3,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
CernlibFortranProgramTarget(exam1,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
TestTarget(exam1,gexam1.dat,gexam1.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam2/Imakefile 2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam2/Imakefile 2008-01-04 17:10:55.000000000 -0800
@@ -13,7 +13,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
CernlibFortranProgramTarget(exam2,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
TestTarget(exam2,gexam2.dat,gexam2.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam3/Imakefile 2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam3/Imakefile 2008-01-04 17:11:26.000000000 -0800
@@ -3,7 +3,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
CernlibFortranProgramTarget(exam3,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
TestTarget(exam3,gexam3.dat,gexam3.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam4/Imakefile 2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam4/Imakefile 2008-01-04 17:11:57.000000000 -0800
@@ -14,7 +14,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
CernlibFortranProgramTarget(exam4,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
TestTarget(exam4,gexam4.dat,gexam4.input)
diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile
--- geant321-3.21.14.dfsg~/src/geant321/examples/gexam5/Imakefile 2008-01-04 17:05:51.000000000 -0800
+++ geant321-3.21.14.dfsg/src/geant321/examples/gexam5/Imakefile 2008-01-04 17:12:26.000000000 -0800
@@ -3,7 +3,11 @@
DefinePackageLibrary(NullParameter)
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#else
CernlibFortranProgramTarget(exam5,$(OBJS),NullParameter,NullParameter,graflib packlib geant321)
+#endif
TestTarget(exam5,gexam5.dat,gexam5.input)
--- NEW FILE mclibs-213-fix-test-suite-build.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 213-fix-test-suite-build.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix build of test-suite for tests during package build.
@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/cojets/test/Imakefile 1996-03-27 09:32:16.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/cojets/test/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -3,7 +3,7 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(cojetst,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib kernlib)
+CernlibFortranProgramTarget(cojetst,test.o,NullParameter,NullParameter,mathlib kernlib cojets)
CopyFile(test.input,test.in)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile 1997-03-14 17:32:14.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -4,11 +4,10 @@
FORTRANSAVEOPTION = FortranSaveFlags
-CernlibFortranProgramTarget(eudtest,$(OBJS),$(PACKAGE_LIB),$(PACKAGE_LIB),packlib)
+CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
TestTarget(eudtest,eurodec.dat,eutitle.dat)
CopyFile(eutitle.data,eutitle.dat)
LinkFileFromDir($(TOP)$(PACKAGETOP),eurodec.dat)
-
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/herwig/test/Imakefile 1997-01-06 17:06:42.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/herwig/test/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -4,6 +4,6 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(herwigt,test.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(herwigt,test.o,NullParameter,NullParameter,kernlib herwig)
TestTarget(herwigt,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/test/Imakefile 2000-07-25 16:21:34.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/test/Imakefile 2008-01-04 18:59:02.000000000 +0000
@@ -6,6 +6,6 @@
LinkFileFromDir($(TOP)$(PACKAGETOP),isajet.dat)
-CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
TestTarget(isajett,isajet.dat,test.input)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/pdf/tpdf/Imakefile 2000-04-19 13:52:13.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/pdf/tpdf/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -13,13 +13,13 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(testpdf,testpdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdf,testpdf.o,NullParameter,NullParameter,mathlib pdflib)
-CernlibFortranProgramTarget(testpdg,testpdg.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testpdg,testpdg.o,NullParameter,NullParameter,mathlib pdflib)
-CernlibFortranProgramTarget(testgam,testgam.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(testgam,testgam.o,NullParameter,NullParameter,mathlib pdflib)
-CernlibFortranProgramTarget(test_npdf,test_npdf.o,$(PACKAGE_LIB),$(PACKAGE_LIB),mathlib)
+CernlibFortranProgramTarget(test_npdf,test_npdf.o,NullParameter,NullParameter,mathlib pdflib)
TestTarget(testpdf,NullParameter,NullParameter)
TestTarget(testpdg,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/photos/test/Imakefile 1999-03-26 10:53:26.000000000 +0000
+++ mclibs-2006.dfsg.2/src/mclibs/photos/test/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -2,6 +2,6 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,$(PACKAGE_LIB),$(PACKAGE_LIB),kernlib)
+CernlibFortranProgramTarget(photost,phodem.o pseudo_jetset.o,NullParameter,NullParameter,kernlib photos)
TestTarget(photost,NullParameter,NullParameter)
diff -urNad mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile
--- mclibs-2006.dfsg.2~/src/phtools/wicoexam/Imakefile 1996-03-22 16:42:50.000000000 +0000
+++ mclibs-2006.dfsg.2/src/phtools/wicoexam/Imakefile 2008-01-04 18:57:55.000000000 +0000
@@ -1,5 +1,5 @@
DefinePackageLibrary(NullParameter)
-CernlibFortranProgramTarget(wicot,wicoex.o,$(PACKAGE_LIB),$(PACKAGE_LIB),NullParameter)
+CernlibFortranProgramTarget(wicot,wicoex.o,NullParameter,NullParameter,packlib phtools)
TestTarget(wicot,NullParameter,NullParameter)
--- NEW FILE mclibs-807-static-link-some-tests-on-64-bit.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 807-static-link-some-tests-on-64-bit.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## 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: broken there.
@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile
--- mclibs-2006.dfsg.2~/src/mclibs/eurodec/eudtest/Imakefile 2008-01-08 09:47:10.000000000 -0800
+++ mclibs-2006.dfsg.2/src/mclibs/eurodec/eudtest/Imakefile 2008-01-08 09:48:35.000000000 -0800
@@ -4,7 +4,11 @@
FORTRANSAVEOPTION = FortranSaveFlags
+#if defined(CERNLIB_LINUX) && defined(CERNLIB_QMLXIA64)
+CernlibFortranStaticTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#else
CernlibFortranProgramTarget(eudtest,$(OBJS),NullParameter,NullParameter,eurodec packlib)
+#endif
TestTarget(eudtest,eurodec.dat,eutitle.dat)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 27 Aug 2007 21:07:07 -0000 1.7
+++ .cvsignore 9 Jan 2008 23:55:25 -0000 1.8
@@ -1,6 +1,6 @@
2006_src-free.tar.gz
patchy.tar.gz
-geant321_3.21.14.dfsg-5.diff.gz
-mclibs_2006.dfsg.2-1.diff.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-2.diff.gz
+cernlib_2006.dfsg.2-5.diff.gz
Index: cernlib-211-support-amd64-and-itanium.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-211-support-amd64-and-itanium.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-211-support-amd64-and-itanium.dpatch 21 Apr 2007 14:35:24 -0000 1.1
+++ cernlib-211-support-amd64-and-itanium.dpatch 9 Jan 2008 23:55:25 -0000 1.2
@@ -9,9 +9,9 @@
## DP: when dynamically linked on 64-bit anyway.
@DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/cfortran/hbook.h cernlib-2005.dfsg/src/cfortran/hbook.h
---- cernlib-2005.dfsg~/src/cfortran/hbook.h 1999-11-15 12:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/cfortran/hbook.h 2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/cfortran/hbook.h cernlib-2006.dfsg.2/src/cfortran/hbook.h
+--- cernlib-2006.dfsg.2~/src/cfortran/hbook.h 1999-11-15 17:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/cfortran/hbook.h 2007-12-14 21:41:27.000000000 +0000
@@ -489,6 +489,10 @@
#define HBALLOC(IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)\
CCALLSFSUB11(HBALLOC,hballoc,INT,STRING,STRING,STRING,INT,INT,INT,INT,INTV,PINT,PINT,IDN,CHDIR,VAR,BLOCK,ITYPE,ISIZE,IFIRST,NELEM,IBASE,IOFF,NUSE)
@@ -37,9 +37,9 @@
PROTOCCALLSFSUB1(HGTDIR,hgtdir,PSTRING)
#define HGTDIR(CHDIR) CCALLSFSUB1(HGTDIR,hgtdir,PSTRING,CHDIR)
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/cspack/cspack/hcntpar.inc 1996-03-08 10:44:16.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/cspack/cspack/hcntpar.inc 2006-09-20 20:12:21.887676289 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/cspack/hcntpar.inc 1996-03-08 15:44:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/cspack/hcntpar.inc 2007-12-14 21:41:27.000000000 +0000
@@ -22,7 +22,7 @@
+ ZIFREA=7, ZNWTIT=8, ZITIT1=9, ZNCHRZ=13, ZIFBIT=8,
+ ZDESC=1, ZLNAME=2, ZNAME=3, ZRANGE=4, ZNADDR=12,
@@ -49,9 +49,9 @@
*
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c
---- cernlib-2005.dfsg~/src/packlib/cspack/sysreq/netreq.c 2006-09-20 20:12:20.249025177 -0400
-+++ cernlib-2005.dfsg/src/packlib/cspack/sysreq/netreq.c 2006-09-20 20:12:22.046642443 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c
+--- cernlib-2006.dfsg.2~/src/packlib/cspack/sysreq/netreq.c 2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/cspack/sysreq/netreq.c 2007-12-14 21:41:27.000000000 +0000
@@ -341,7 +341,7 @@
return(-errno);
}
@@ -61,9 +61,9 @@
TRACE(2, "sysreq", "RecvStr(RepLen): (errno=%d)", errno);
(void) close(s);
END_TRACE();
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc
---- cernlib-2005.dfsg~/src/packlib/hbook/hbook/hcntpar.inc 1996-01-16 12:07:52.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hbook/hcntpar.inc 2006-09-20 20:12:22.104630097 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hbook/hcntpar.inc 1996-01-16 17:07:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hbook/hcntpar.inc 2007-12-14 21:41:27.000000000 +0000
@@ -24,7 +24,7 @@
+ ZIFREA=7, ZNWTIT=8, ZITIT1=9, ZNCHRZ=13, ZIFBIT=8,
+ ZDESC=1, ZLNAME=2, ZNAME=3, ZRANGE=4, ZNADDR=12,
@@ -73,9 +73,9 @@
*
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hcreatem.F 1996-03-13 05:13:20.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hcreatem.F 2006-09-20 20:12:22.326582841 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hcreatem.F 1996-03-13 10:13:20.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hcreatem.F 2007-12-14 21:41:27.000000000 +0000
@@ -39,11 +39,11 @@
************************************************************************
*
@@ -101,9 +101,9 @@
#if (defined(CERNLIB_DECS))&&(!defined(CERNLIB_ALPHA))
ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hmmap/hmapm.F 2001-10-02 05:06:15.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/hbook/hmmap/hmapm.F 2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hmmap/hmapm.F 2001-10-02 09:06:15.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hmmap/hmapm.F 2007-12-14 21:41:27.000000000 +0000
@@ -54,11 +54,11 @@
************************************************************************
*
@@ -129,9 +129,9 @@
#if defined(CERNLIB_DECS)
ICOMAD(1) = 4*LOCF(ICOMAD(1)) + MFEN
ICOMAD(1) = ((ICOMAD(1)+4095)/4096)*4096
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hballoc.F 1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hballoc.F 2006-09-20 20:12:22.343579222 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hballoc.F 1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hballoc.F 2007-12-14 21:41:27.000000000 +0000
@@ -42,3 +42,26 @@
ENDIF
*
@@ -159,9 +159,9 @@
+ ENDIF
+*
+ END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hbnt.F 1996-01-16 12:07:56.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hbnt.F 2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hbnt.F 1996-01-16 17:07:56.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hbnt.F 2007-12-14 21:41:27.000000000 +0000
@@ -269,11 +269,13 @@
************************************************************************
* * * *
@@ -177,9 +177,9 @@
************************************************************************
#endif
*
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgnt2.F 1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgnt2.F 2006-09-20 20:12:22.344579009 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgnt2.F 1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgnt2.F 2007-12-14 21:41:27.000000000 +0000
@@ -34,7 +34,13 @@
#include "hbook/hcrecv.inc"
*
@@ -218,9 +218,9 @@
ENDIF
LQ(LTMP1-IQ(LTMP1+1)) = LBLOK
*
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntbf.F 1996-01-16 12:07:57.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntbf.F 2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntbf.F 1996-01-16 17:07:57.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntbf.F 2007-12-14 21:41:27.000000000 +0000
@@ -26,3 +26,13 @@
CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
*
@@ -235,9 +235,9 @@
+ CALL HGNT1(IDN, '*', VAR, IOFFST, NVAR1, IDNEVT, IERROR)
+*
+ END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F
---- cernlib-2005.dfsg~/src/packlib/hbook/hntup/hgntf.F 1999-03-05 10:42:35.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/hntup/hgntf.F 2006-09-20 20:14:51.026922890 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/hntup/hgntf.F 1999-03-05 15:42:35.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/hbook/hntup/hgntf.F 2007-12-14 21:41:27.000000000 +0000
@@ -37,6 +37,13 @@
INTEGER ILOGIC
LOGICAL LOGIC, INDVAR, USEBUF
@@ -289,9 +289,9 @@
ENDIF
*
40 CONTINUE
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile 2002-09-19 12:44:52.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile 2006-09-20 20:12:22.345578796 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/Imakefile 2002-09-19 16:44:52.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/Imakefile 2007-12-14 21:41:27.000000000 +0000
@@ -11,6 +11,10 @@
sleepf.c signalf.c sigprnt.c sigunbl.c stati.c systei.c \ @@\
tminit.c unlini.c tmread.c
@@ -303,9 +303,9 @@
#ifndef CERNLIB_OS9
SRCS_C += timel.c lstati.c
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/chkloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/chkloc.c 2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/chkloc.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/chkloc.c 2007-12-14 21:41:27.000000000 +0000
@@ -0,0 +1,10 @@
+/*
+ * Utility routine for locf and locb
@@ -317,9 +317,9 @@
+#include "lp64gs/chkloc.c"
+#endif
+
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumptn.c 2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumptn.c 2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumptn.c 2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumptn.c 2007-12-14 21:41:27.000000000 +0000
@@ -20,8 +20,10 @@
*/
#include "kerngen/pilot.h"
@@ -333,9 +333,9 @@
#else
/*> ROUTINE JUMPTN
CERN PROGLIB# Z043 JUMPTN .VERSION KERNFOR 4.40 940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c 2004-07-29 10:07:43.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/jumpxn.c 2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/jumpxn.c 2004-07-29 14:07:43.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/jumpxn.c 2007-12-14 21:41:27.000000000 +0000
@@ -20,8 +20,10 @@
*/
#include "kerngen/pilot.h"
@@ -348,9 +348,9 @@
#else
/*> ROUTINE JUMPXN
CERN PROGLIB# Z042 JUMPXN .VERSION KERNFOR 4.40 940929
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lenocc.c 1997-10-23 12:25:11.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lenocc.c 2006-09-20 20:12:22.582528347 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lenocc.c 1997-10-23 16:25:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lenocc.c 2007-12-14 21:41:27.000000000 +0000
@@ -46,7 +46,7 @@
/* look at the last ntail characters */
@@ -360,9 +360,9 @@
for (i = ntail; i > 0; i--)
{ if (*--chcur != ' ') goto exit; }
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locb.c 1997-09-02 10:26:37.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locb.c 2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locb.c 1997-09-02 14:26:37.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locb.c 2007-12-14 21:41:27.000000000 +0000
@@ -26,6 +26,9 @@
# define DummyDef
#endif
@@ -382,9 +382,9 @@
#undef CERNLIB_TCGEN_LOCB
#endif
+
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/locf.c 2004-07-29 10:06:07.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/locf.c 2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/locf.c 2004-07-29 14:06:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/locf.c 2007-12-14 21:41:27.000000000 +0000
@@ -50,6 +50,8 @@
#include "irtdgs/locf.c"
#elif defined(CERNLIB_QMVAOS)
@@ -420,9 +420,9 @@
}
#undef Dummy2LocPar
#undef DummyDef
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c 2006-09-20 20:12:22.583528134 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/chkloc.c 2007-12-14 21:41:27.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *
@@ -482,24 +482,17 @@
+}
+/*> END <----------------------------------------------------------*/
+
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c 2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumptn.c 2007-12-14 21:41:27.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * $Id$
+ *
+ * $Log$
-+ * Revision 1.1 2007/04/21 14:35:24 pertusus
-+ * * Fri Apr 13 2007 Patrice Dumas <pertusus at free.fr> 2006-1
-+ * - update to cernlib 2006
-+ * - build with gfortran
-+ * - use system Xbae and Xaw
-+ * - ship man pages, app-defaults, icons and paw++ desktop file (from debian)
-+ * - run tests
-+ * - use optflags in patchy4
-+ * - bootstrap npatchy with p5boot (instead of using patchy4)
-+ * - fix npatchy build
++ * Revision 1.2 2008/01/09 23:55:25 pertusus
++ * * Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
++ * - new debian patchesets
+ *
+ * Revision 1.1.1.1 1996/02/15 17:49:32 mclareni
+ * Kernlib
@@ -580,24 +573,17 @@
+ return;
+}
+/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c 2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/jumpxn.c 2007-12-14 21:41:27.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ * $Id$
+ *
+ * $Log$
-+ * Revision 1.1 2007/04/21 14:35:24 pertusus
-+ * * Fri Apr 13 2007 Patrice Dumas <pertusus at free.fr> 2006-1
-+ * - update to cernlib 2006
-+ * - build with gfortran
-+ * - use system Xbae and Xaw
-+ * - ship man pages, app-defaults, icons and paw++ desktop file (from debian)
-+ * - run tests
-+ * - use optflags in patchy4
-+ * - bootstrap npatchy with p5boot (instead of using patchy4)
-+ * - fix npatchy build
++ * Revision 1.2 2008/01/09 23:55:25 pertusus
++ * * Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
++ * - new debian patchesets
+ *
+ * Revision 1.1.1.1 1996/02/15 17:49:32 mclareni
+ * Kernlib
@@ -687,10 +673,10 @@
+ return;
+}
+/*> END <----------------------------------------------------------*/
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c 2006-09-20 20:12:22.584527921 -0400
-@@ -0,0 +1,12 @@
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locb.c 2007-12-14 21:52:38.000000000 +0000
+@@ -0,0 +1,37 @@
+/*> ROUTINE LOCB
+ CERN PROGLIB# N101 LOCB .VERSION KERNFOR 4.36 930602
+*/
@@ -703,9 +689,34 @@
+ return (chkloc(iadr));
+}
+
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c 1969-12-31 19:00:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c 2006-09-20 20:12:22.584527921 -0400
++#include <stdint.h> /* for ptrdiff_t, size_t */
++#include <stdio.h> /* for fprintf */
++#include <stdlib.h> /* for exit */
++
++int iptrdiff_(iadr1, iadr2)
++ char * iadr1, * iadr2;
++{
++ long diff = (long)iadr1 - (long)iadr2;
++ if (diff < (long)INT32_MIN || diff > (long)INT32_MAX) {
++ fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++ fprintf(stderr, "IPTRDIFF: difference of addresses %p and %p\n", iadr1, iadr2);
++ fprintf(stderr, "cannot be stored in 32-bit signed integer!\n");
++ fprintf(stderr, "This may result in program crash or incorrect results\n");
++ fprintf(stderr, "Therefore we will stop here\n");
++ fprintf(stderr, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
++ exit (999);
++ }
++ else return (int)diff;
++}
++
++int iptrsame_(iadr1, iadr2)
++ char * iadr1, * iadr2;
++{
++ return (size_t)iadr1 == (size_t)iadr2 ? 1 : 0;
++}
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c 1970-01-01 00:00:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/lp64gs/locf.c 2007-12-14 21:41:27.000000000 +0000
@@ -0,0 +1,10 @@
+/*> ROUTINE LOCF
+ CERN PROGLIB# N100 LOCF .VERSION KERNFOR 4.36 930602
@@ -717,9 +728,9 @@
+{
+ return ( (chkloc(iadr)) >> 2 );
+}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c
---- cernlib-2005.dfsg~/src/packlib/kernlib/kerngen/ccgen/signalf.c 1999-10-06 10:17:01.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kernlib/kerngen/ccgen/signalf.c 2006-09-20 20:12:22.584527921 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/ccgen/signalf.c 1999-10-06 14:17:01.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/ccgen/signalf.c 2007-12-14 21:41:27.000000000 +0000
@@ -45,6 +45,7 @@
C- function value = adr of previous handler
*/
@@ -758,9 +769,9 @@
#ifndef __GNUC__
if (oldhand == SIG_ERR) istat = -1;
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_kuip/kkern.c 1996-05-01 08:08:38.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_kuip/kkern.c 2006-09-20 20:12:22.585527708 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_kuip/kkern.c 1996-05-01 12:08:38.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_kuip/kkern.c 2007-12-14 21:41:27.000000000 +0000
@@ -39,7 +39,8 @@
if( len >= (sizeof blanks) * 4 ) {
@@ -771,9 +782,9 @@
case 7:
if( str[--len] != ' ' ) return len + 1;
case 6:
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kmbrow.c 1996-03-08 10:33:08.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kmbrow.c 2006-09-20 20:12:22.586527495 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kmbrow.c 1996-03-08 15:33:08.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kmbrow.c 2007-12-14 21:41:27.000000000 +0000
@@ -278,7 +278,7 @@
char *path, *title;
char cval[MAX_string], cval1[MAX_string];
@@ -783,9 +794,9 @@
BrObject *brobj;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/kuxxt.c 1996-03-08 10:33:11.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/kuxxt.c 2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/kuxxt.c 1996-03-08 15:33:11.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/kuxxt.c 2007-12-14 21:41:27.000000000 +0000
@@ -340,7 +340,7 @@
{
(void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -804,9 +815,9 @@
return ( UX_NO_ERROR );
}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdcmp.c 1996-03-15 10:54:00.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdcmp.c 2006-09-20 20:12:22.587527283 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdcmp.c 1996-03-15 15:54:00.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdcmp.c 2007-12-14 21:41:27.000000000 +0000
@@ -1541,7 +1541,11 @@
Widget cpanel = stag->command_panel;
@@ -820,9 +831,9 @@
KmParameter *par = cmd->par[ipar];
KmParFile *pfil = par->ptype;
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkdgra.c 1996-03-08 10:33:07.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkdgra.c 2006-09-20 20:12:22.588527070 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkdgra.c 1996-03-08 15:33:07.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkdgra.c 2007-12-14 21:41:27.000000000 +0000
@@ -289,11 +289,12 @@
km_graph_init_callbacks (km_graphicsDraw, graph_widget, wkid, 0);
}
@@ -838,9 +849,9 @@
if (flag == 0) {
XtAddCallback(draw, XmNexposeCallback,
(XtCallbackProc)drawing_area_callback, graph_widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c
---- cernlib-2005.dfsg~/src/packlib/kuip/code_motif/mkuip.c 2006-09-20 20:12:20.148046676 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/code_motif/mkuip.c 2006-09-20 20:12:22.589526857 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/code_motif/mkuip.c 2007-12-14 21:41:17.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/code_motif/mkuip.c 2007-12-14 21:41:27.000000000 +0000
@@ -1687,7 +1687,7 @@
XmStringFree(xmstr);
} /* end for ... */
@@ -868,9 +879,9 @@
XtManageChild(PdMenu);
}
}
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/help.c 1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/help.c 2006-09-20 20:12:22.590526644 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/help.c 1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/help.c 2007-12-14 21:41:27.000000000 +0000
@@ -309,7 +309,7 @@
int *type;
XmAnyCallbackStruct *call_data;
@@ -880,9 +891,9 @@
if (help[t])
XRaiseWindow(XtDisplay(help[t]), XtWindow(help[t]));
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/kxterm.c 2005-04-18 11:40:49.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/kxterm.c 2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/kxterm.c 2005-04-18 15:40:49.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/kxterm.c 2007-12-14 21:41:27.000000000 +0000
@@ -1533,7 +1533,7 @@
XtPointer cbs;
{
@@ -892,9 +903,9 @@
Boolean result = True;
text_w = get_selection_owner(widget);
-diff -urNad cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c
---- cernlib-2005.dfsg~/src/packlib/kuip/programs/kxterm/uxxt.c 1996-03-08 10:33:04.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/kuip/programs/kxterm/uxxt.c 2006-09-20 20:12:22.591526431 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/uxxt.c 1996-03-08 15:33:04.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/uxxt.c 2007-12-14 21:41:27.000000000 +0000
@@ -340,7 +340,7 @@
{
(void) XDeleteContext( XtDisplay( UxTopLevel ),
@@ -913,9 +924,9 @@
return ( UX_NO_ERROR );
}
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zerror.F 1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zerror.F 2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zerror.F 1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zerror.F 2007-12-14 21:41:27.000000000 +0000
@@ -16,6 +16,10 @@
C ******************************************************************
C
@@ -950,9 +961,9 @@
C
IF (NEWERR.LE.0)RETURN
C
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c
---- cernlib-2005.dfsg~/src/packlib/zbook/code/zjump.c 1996-03-08 07:01:12.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/zjump.c 2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/zjump.c 1996-03-08 12:01:12.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/zjump.c 2007-12-14 21:41:27.000000000 +0000
@@ -7,6 +7,9 @@
*
*/
@@ -987,9 +998,9 @@
}
#endif
+#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F
---- cernlib-2005.dfsg~/src/packlib/zbook/code/ztrap.F 1996-03-08 07:01:13.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/zbook/code/ztrap.F 2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F
+--- cernlib-2006.dfsg.2~/src/packlib/zbook/code/ztrap.F 1996-03-08 12:01:13.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zbook/code/ztrap.F 2007-12-14 21:41:27.000000000 +0000
@@ -48,8 +48,10 @@
#if defined(CERNLIB_BESM6)
IZ(JZ+19) = LOCF(IUSER)
@@ -1002,9 +1013,9 @@
#endif
END
#endif
-diff -urNad cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F
---- cernlib-2005.dfsg~/src/packlib/zebra/test/brztest/btest2.F 1997-09-02 11:16:16.000000000 -0400
-+++ cernlib-2005.dfsg/src/packlib/zebra/test/brztest/btest2.F 2006-09-20 20:12:22.592526218 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F
+--- cernlib-2006.dfsg.2~/src/packlib/zebra/test/brztest/btest2.F 1997-09-02 15:16:16.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/zebra/test/brztest/btest2.F 2007-12-14 21:41:27.000000000 +0000
@@ -29,6 +29,15 @@
********************************************************************************
*
Index: cernlib-803-link-binaries-dynamically.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/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 21 Apr 2007 14:35:24 -0000 1.2
+++ cernlib-803-link-binaries-dynamically.dpatch 9 Jan 2008 23:55:25 -0000 1.3
@@ -5,10 +5,10 @@
## DP: Link binaries dynamically against Cern libraries.
@DPATCH@
-diff -urNad cernlib-2005.05.09/src/config/fortran.rules /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules
---- cernlib-2005.05.09/src/config/fortran.rules 2005-06-13 15:26:19.991403858 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/config/fortran.rules 2005-06-13 15:26:23.699609849 -0400
-@@ -189,13 +189,13 @@
+diff -urNad cernlib-2006.dfsg.2~/src/config/fortran.rules cernlib-2006.dfsg.2/src/config/fortran.rules
+--- cernlib-2006.dfsg.2~/src/config/fortran.rules 2007-12-14 01:25:54.000000000 +0000
++++ cernlib-2006.dfsg.2/src/config/fortran.rules 2007-12-14 01:34:31.000000000 +0000
+@@ -189,7 +189,7 @@
*/
#ifndef CernlibDependLibrary
#define CernlibDependLibrary(cernlibs)\
@@ -17,23 +17,33 @@
#endif
/* Helper to use cernlib command
+@@ -202,17 +202,22 @@
+ * cernlib utility to find give all required libraries ( ie. no extra
+ * syslibs needed.
*/
- #ifndef CernlibCmd
--#define CernlibCmd(libraries)cernlib libraries
-+#define CernlibCmd(libraries)cernlib -dy libraries
- #endif
- /*
- * CernlibFortranProgramTarget - rule to link fortran program using
-@@ -207,7 +207,7 @@
+-#ifndef CernlibFortranProgramTarget
+-#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++#ifndef CernlibFortranStaticTarget
++#define CernlibFortranStaticTarget(program,objects,deplibs,locallibs,cernlibs)\
ProgramTargetName(program): SetWin32ObjSuffix(objects) deplibs CernlibDependLibrary(cernlibs) @@\
RemoveTargetProgram($@) @@\
@echo "Linking with cern libraries" @@\
- @cernlib cernlibs @@\
-+ @cernlib -dy cernlibs @@\
++ @CernlibCmd(cernlibs) @@\
CernlibFortranLinkRule($@,$(FCLDOPTIONS),objects,locallibs $(LDLIBS),CernlibCmd(cernlibs)) @@\
@@\
clean:: @@\
-@@ -233,8 +233,8 @@
+ RemoveFile(ProgramTargetName(program)) @@\
+
++#endif /*CernlibFortranStaticTarget */
++
++#ifndef CernlibFortranProgramTarget
++#define CernlibFortranProgramTarget(program,objects,deplibs,locallibs,cernlibs)\
++CernlibFortranStaticTarget(program,objects,deplibs,locallibs,-dy cernlibs)
+ #endif /*CernlibFortranProgramTarget */
+
+ /*
+@@ -233,8 +238,8 @@
ProgramTargetName(program): objects deplibs CernlibDependLibrary(cernlibs) @@\
RemoveTargetProgram($@) @@\
@echo "Linking with cern libraries" @@\
@@ -44,9 +54,9 @@
@@\
clean:: @@\
RemoveFile(ProgramTargetName(program)) @@\
-diff -urNad cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile
---- cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile 2005-06-13 15:26:18.903636773 -0400
-+++ /tmp/dpep.E9pQlc/cernlib-2005.05.09/src/packlib/kuip/programs/kxterm/Imakefile 2005-06-13 15:26:23.699609849 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kuip/programs/kxterm/Imakefile 2007-12-14 01:25:53.000000000 +0000
++++ cernlib-2006.dfsg.2/src/packlib/kuip/programs/kxterm/Imakefile 2007-12-14 01:25:57.000000000 +0000
@@ -13,14 +13,14 @@
DefinePackageLibrary(kxtlib)
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cernlib.spec 1 Jan 2008 00:40:04 -0000 1.65
+++ cernlib.spec 9 Jan 2008 23:55:25 -0000 1.66
@@ -55,7 +55,7 @@
Name: %{?compat}cernlib%{?compiler}
Version: 2006
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: General purpose CERN library
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,10 +138,10 @@
Source204: cernlib-debian-copyright.in
# debian patchsets
-Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-5.diff.gz
Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
-Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-1.diff.gz
-Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-5.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
# change file to directory to DATADIR
Patch1100: cernlib-enforce-FHS.diff
Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -210,6 +210,12 @@
Patch21101: cernlib-211-support-amd64-and-itanium.dpatch
Patch21102: paw-211-support-amd64-and-itanium.dpatch
Patch2111: cernlib-211-support-digital-alpha.dpatch
+Patch212: cernlib-212-print-test-results.dpatch
+Patch21301: cernlib-213-fix-test-suite-build.dpatch
+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
Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
# Use another approach, see cernlib-enforce-FHS
# Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -289,6 +295,9 @@
Patch80602: paw-806-bump-mathlib-and-dependents-sonames.dpatch
Patch80603: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
Patch80604: mclibs-806-bump-mathlib-and-dependents-sonames.dpatch
+Patch80701: cernlib-807-static-link-some-tests-on-64-bit.dpatch
+Patch80702: geant321-807-static-link-some-tests-on-64-bit.dpatch
+Patch80703: mclibs-807-static-link-some-tests-on-64-bit.dpatch
# change the cernlib script such that -llapack -lblas is used instead of
# cernlib lapack
@@ -300,21 +309,10 @@
Patch1200: cernlib-script.patch
# don't stop if the CERN variable isn't defined
Patch1201: cernlib-gxint-script.diff
-# not needed in 2006
-#Patch1203: cernlib-hwuli2_use_dimag.diff
-#Patch1204: cernlib-hwhiga_use_dimag.diff
# modify the cernlib man page to fit with the distribution
Patch1206: cernlib-man_static.patch
# modify the debian cernlib paw desktop file icon name
Patch1207: cernlib-fedora_desktop.patch
-# fix tests Imakefiles
-Patch1208: cernlib-test.patch
-# don't recurse in eurodec for tests because the testcase segfaults
-Patch1210: cernlib-segf_eudtest.patch
-# kernlib/kernnum packlib/{ffread hbook kuip zbook zebra} test error on 64 bit
-# packlib/{ffread hbook kuip} segfaults on ppc64
-Patch1211: cernlib-64test.patch
-
# patchy 4
# not applied as it has allready been done by the sed one-liner in
@@ -610,6 +608,11 @@
%patch -P 21101 -p1
%patch -P 21102 -p1
%patch -P 2111 -p1
+%patch -P 21301 -p1
+%patch -P 21302 -p1
+%patch -P 21303 -p1
+%patch -P 214 -p1
+%patch -P 215 -p1
%patch -P 300 -p1
#%patch -P 301 -p1
#%patch -P 302 -p1
@@ -752,20 +755,15 @@
%patch -P 80602 -p1
%patch -P 80603 -p1
%patch -P 80604 -p1
+%patch -P 80701 -p1
+%patch -P 80702 -p1
+%patch -P 80703 -p1
%patch -P 1504 -p2 -b .np_flags
#%patch -P 1505 -p1
%patch -P 1506 -p2 -b .curdir
%patch -P 1201
-#%patch -P 1203
-#%patch -P 1204
-%patch -P 1208 -p2 -b .test
-%patch -P 1210 -p2 -b .segf_eudtest
-
-%ifarch x86_64 ppc64
-%patch -P 1211 -p2 -b .64test
-%endif
# remove CVS directories
find . -depth -type d -name CVS -exec rm -rf {} ';'
@@ -1177,16 +1175,30 @@
cd $CERN_ROOT/build
# no test in code_motif paw_motif scripts patchy pawlib
-test_dirs='graflib mclibs kernlib mathlib packlib phtools'
+test_dirs='graflib mclibs kernlib mathlib packlib phtools geant321'
-%ifnarch x86_64 ppc64
-test_dirs="$test_dirs geant321"
-%endif
+#%ifnarch x86_64 ppc64
+#test_dirs="$test_dirs geant321"
+#%endif
+rm -f __dist_failed_builds
for dir in $test_dirs; do
-make -C $dir test
+make -C $dir test || echo $dir >> __dist_failed_builds
done
+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
+
%clean
rm -rf %{buildroot}
@@ -1418,6 +1430,9 @@
%endif
%changelog
+* Tue Jan 8 2008 Patrice Dumas <pertusus at free.fr> 2006-22
+- new debian patchesets
+
* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
- no --build-id for EL-5
Index: geant321-001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-001-fix-missing-fluka.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geant321-001-fix-missing-fluka.dpatch 21 Apr 2007 14:35:24 -0000 1.2
+++ geant321-001-fix-missing-fluka.dpatch 9 Jan 2008 23:55:25 -0000 1.3
@@ -5,9 +5,9 @@
## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
@DPATCH@
-diff -urNad geant321-3.21.14~/src/geant321/Imakefile geant321-3.21.14/src/geant321/Imakefile
---- geant321-3.21.14~/src/geant321/Imakefile 1998-03-05 06:20:07.000000000 -0500
-+++ geant321-3.21.14/src/geant321/Imakefile 2007-01-30 17:37:26.209615233 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/Imakefile 1998-03-05 03:20:07.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/Imakefile 2008-01-04 17:00:47.000000000 -0800
@@ -4,10 +4,11 @@
AllTarget(geant321)
@@ -35,9 +35,23 @@
/* This will install the correct link for xsneut95.dat at CERN;
* If you want a local copy of the file, just copy it there
-diff -urNad geant321-3.21.14~/src/geant321/geant321/gcnmec.inc geant321-3.21.14/src/geant321/geant321/gcnmec.inc
---- geant321-3.21.14~/src/geant321/geant321/gcnmec.inc 1995-10-24 06:20:31.000000000 -0400
-+++ geant321-3.21.14/src/geant321/geant321/gcnmec.inc 2007-01-30 17:39:15.301513801 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile geant321-3.21.14.dfsg/src/geant321/examples/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/examples/Imakefile 1996-03-06 09:31:38.000000000 -0800
++++ geant321-3.21.14.dfsg/src/geant321/examples/Imakefile 2008-01-04 17:01:20.000000000 -0800
+@@ -1,7 +1,10 @@
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' /* for NamedMakeSubdirs */
+
++/* gexam4 needs fluka
+ SUBDIRS= gexam1 gexam2 gexam3 gexam4 gexam5
++*/
++SUBDIRS= gexam1 gexam2 gexam3 gexam5
+
+ TestSubdirs($(SUBDIRS))
+
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc
+--- geant321-3.21.14.dfsg~/src/geant321/geant321/gcnmec.inc 1995-10-24 03:20:31.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/geant321/gcnmec.inc 2008-01-04 17:00:47.000000000 -0800
@@ -16,13 +16,14 @@
PARAMETER(NMECA=45,IBLOWN=23)
CHARACTER*4 CHNMEC(NMECA)
@@ -55,9 +69,9 @@
+ 'HADG', 'INEG', 'ELAG', 'FISG', 'CAPG',
+ 'LOSS', 'PHOT', 'ANNI', 'COMP', 'BREM',
+ 'PAIR', 'DRAY', 'PFIS', 'RAYL', 'MUNU',
-diff -urNad geant321-3.21.14~/src/geant321/miface/Imakefile geant321-3.21.14/src/geant321/miface/Imakefile
---- geant321-3.21.14~/src/geant321/miface/Imakefile 1995-10-24 06:21:53.000000000 -0400
-+++ geant321-3.21.14/src/geant321/miface/Imakefile 2007-01-30 17:37:26.319591944 -0500
+diff -urNad geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile geant321-3.21.14.dfsg/src/geant321/miface/Imakefile
+--- geant321-3.21.14.dfsg~/src/geant321/miface/Imakefile 1995-10-24 03:21:53.000000000 -0700
++++ geant321-3.21.14.dfsg/src/geant321/miface/Imakefile 2008-01-04 17:00:47.000000000 -0800
@@ -1,5 +1,5 @@
SRCS_F= \ @@\
- gfmdis.F gfmfin.F gmicap.F gmiset.F gmorin.F gmplxs.F gmxsec.F
Index: mclibs-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/mclibs-321-support-gfortran.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-321-support-gfortran.dpatch 21 Apr 2007 14:35:24 -0000 1.1
+++ mclibs-321-support-gfortran.dpatch 9 Jan 2008 23:55:25 -0000 1.2
@@ -21,11 +21,13 @@
diff -urNad mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile
--- mclibs-2005.dfsg~/src/mclibs/isajet/test/Imakefile 2000-07-25 12:21:34.000000000 -0400
+++ mclibs-2005.dfsg/src/mclibs/isajet/test/Imakefile 2006-09-27 13:49:49.783806148 -0400
-@@ -8,4 +8,7 @@
+@@ -8,4 +8,9 @@
- CernlibFortranProgramTarget(isajett,isajett.o,$(PACKAGE_LIB),$(PACKAGE_LIB),pdflib804 mathlib kernlib)
+ CernlibFortranProgramTarget(isajett,isajett.o,NullParameter,NullParameter,pdflib804 mathlib kernlib isajet)
+#if !defined(CERNLIB_GFORTRAN)
+/* breaks on 'STOP 99' if compiled with gfortran */
TestTarget(isajett,isajet.dat,test.input)
++#else
++test::
+#endif
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 27 Aug 2007 21:07:07 -0000 1.8
+++ sources 9 Jan 2008 23:55:25 -0000 1.9
@@ -1,6 +1,6 @@
fe71a3f6b95ff2151c5a4690116a0358 2006_src-free.tar.gz
b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz
-c3133b7a5885bd1ee7e47d4f4e76beca geant321_3.21.14.dfsg-5.diff.gz
-3978b81499f205062b540aa58bb79193 mclibs_2006.dfsg.2-1.diff.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
-2a9795aed7895477a2759dc34e7f9b96 cernlib_2006.dfsg.2-2.diff.gz
+e0532ec3a8b5f0124679d7e07b3bcb1a cernlib_2006.dfsg.2-5.diff.gz
--- cernlib-64test.patch DELETED ---
--- cernlib-segf_eudtest.patch DELETED ---
--- cernlib-test.patch DELETED ---
- Previous message (by thread): rpms/dnssec-tools/F-8 dnssec-tools.spec,1.8,1.9
- Next message (by thread): rpms/cernlib-g77/devel cernlib-212-print-test-results.dpatch, NONE, 1.1 cernlib-213-fix-test-suite-build.dpatch, NONE, 1.1 cernlib-214-fix-kernnum-funcs-on-64-bit.dpatch, NONE, 1.1 cernlib-215-work-around-g77-bug-on-ia64.dpatch, NONE, 1.1 cernlib-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 geant321-213-fix-test-suite-build.dpatch, NONE, 1.1 geant321-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 mclibs-213-fix-test-suite-build.dpatch, NONE, 1.1 mclibs-807-static-link-some-tests-on-64-bit.dpatch, NONE, 1.1 .cvsignore, 1.3, 1.4 cernlib-211-support-amd64-and-itanium.dpatch, 1.1, 1.2 cernlib-803-link-binaries-dynamically.dpatch, 1.1, 1.2 cernlib-g77.spec, 1.5, 1.6 geant321-001-fix-missing-fluka.dpatch, 1.1, 1.2 mclibs-321-support-gfortran.dpatch, 1.1, 1.2 sources, 1.3, 1.4 cernlib-64test.patch, 1.1, NONE cernlib-segf_eudtest.patch, 1.1, NONE cernlib-test.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list