rpms/cernlib/devel cernlib-124-integrate-patchy-bootstrap.dpatch, NONE, 1.1 cernlib-125-fix-PLINAME-creation.dpatch, NONE, 1.1 cernlib-126-fix-patchy-compile-flags.dpatch, NONE, 1.1 cernlib-127-yexpand-makes-tmpfiles-in-pwd.dpatch, NONE, 1.1 .cvsignore, 1.11, 1.12 315-fixes-for-MacOSX.dpatch, 1.5, 1.6 cernlib-304-update-Imake-config-files.dpatch, 1.4, 1.5 cernlib-321-support-gfortran.dpatch, 1.5, 1.6 cernlib.spec, 1.71, 1.72 sources, 1.12, 1.13 npatchy-curdir.patch, 1.1, NONE npatchy-np_flags.patch, 1.1, NONE
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Mon Mar 24 23:49:30 UTC 2008
Author: pertusus
Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12445
Modified Files:
.cvsignore 315-fixes-for-MacOSX.dpatch
cernlib-304-update-Imake-config-files.dpatch
cernlib-321-support-gfortran.dpatch cernlib.spec sources
Added Files:
cernlib-124-integrate-patchy-bootstrap.dpatch
cernlib-125-fix-PLINAME-creation.dpatch
cernlib-126-fix-patchy-compile-flags.dpatch
cernlib-127-yexpand-makes-tmpfiles-in-pwd.dpatch
Removed Files:
npatchy-curdir.patch npatchy-np_flags.patch
Log Message:
* Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
- new cernlib, paw and geant321 debian patchesets
- use regular p5boot and patchy build
--- NEW FILE cernlib-124-integrate-patchy-bootstrap.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 124-integrate-patchy-bootstrap.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Write a stub Imakefile for the "p5boot" directory so it can easily
## DP: be integrated into the build.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/Imakefile cernlib-2006.dfsg.2/src/Imakefile
--- cernlib-2006.dfsg.2~/src/Imakefile 2008-02-26 14:39:40.000000000 -0800
+++ cernlib-2006.dfsg.2/src/Imakefile 2008-02-26 14:41:31.000000000 -0800
@@ -7,7 +7,7 @@
SUBDIRS= $(LIBDIRS) patchy cfortran
#ifdef CERNLIB_UNIX
-SUBDIRS:= $(SUBDIRS) scripts mgr
+SUBDIRS:= $(SUBDIRS) p5boot scripts mgr
#endif
InstallLibSubdirs($(LIBDIRS))
diff -urNad cernlib-2006.dfsg.2~/src/p5boot/Imakefile cernlib-2006.dfsg.2/src/p5boot/Imakefile
--- cernlib-2006.dfsg.2~/src/p5boot/Imakefile 1969-12-31 16:00:00.000000000 -0800
+++ cernlib-2006.dfsg.2/src/p5boot/Imakefile 2008-02-26 14:39:46.000000000 -0800
@@ -0,0 +1,7 @@
+install.bin: $(CERN_ROOT)/bin/ypatchy
+
+$(CERN_ROOT)/bin/ypatchy: $(CVSCOSRC)/p5boot/p5boot.sh
+ chmod a+x $<
+ FCOMP="$(FC) $(FCFLAGS)" $<
+
+.PHONY: install.bin
diff -urNad cernlib-2006.dfsg.2~/src/p5boot/p5boot.sh cernlib-2006.dfsg.2/src/p5boot/p5boot.sh
--- cernlib-2006.dfsg.2~/src/p5boot/p5boot.sh 2006-12-07 06:17:53.000000000 -0800
+++ cernlib-2006.dfsg.2/src/p5boot/p5boot.sh 2008-02-26 14:39:46.000000000 -0800
@@ -1,20 +1,22 @@
-#!/bin/sh
+#!/bin/sh -e
-mkdir -p $CERN_ROOT/build/p5boot
-cd $CERN_ROOT/build/p5boot
-cp -p -r $CERN_ROOT/src/p5boot/* .
+mkdir -p "$CERN_ROOT"/build/p5boot
+cd "$CERN_ROOT"/build/p5boot
+cp -p -r -f "$CERN_ROOT"/src/p5boot/* .
AR="ar cr"
-cd $CERN_ROOT/build/p5boot/p5lib
+cd "$CERN_ROOT"/build/p5boot/p5lib
$FCOMP -c *.f
+# This file contains a "main" program which we don't want in the library:
+rm -f nsynopt.o
$AR ../p5lib.a *.o
-cd $CERN_ROOT/build/p5boot
+cd "$CERN_ROOT"/build/p5boot
-$FCOMP -o nypatchy nypatchy.f p5lib.a $CERN_ROOT/lib/libkernlib.a
+$FCOMP -o nypatchy nypatchy.f p5lib.a "$CERN_ROOT"/lib/libkernlib.a
-cd $CERN_ROOT/bin
-ln -s $CERN_ROOT/build/p5boot/nypatchy ypatchy
+cd "$CERN_ROOT"/bin
+ln -s "$CERN_ROOT"/build/p5boot/nypatchy ypatchy
-cd $CERN_ROOT/build
+cd "$CERN_ROOT"/build
--- NEW FILE cernlib-125-fix-PLINAME-creation.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 125-fix-PLINAME-creation.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix creation of PLINAME Make variable so that -DDEBIAN_VERSION=...
## DP: will not get incorporated into it (confusing patchy).
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/patchy/Imakefile cernlib-2006.dfsg.2/src/patchy/Imakefile
--- cernlib-2006.dfsg.2~/src/patchy/Imakefile 2006-09-06 07:36:54.000000000 -0700
+++ cernlib-2006.dfsg.2/src/patchy/Imakefile 2008-02-26 13:13:47.000000000 -0800
@@ -49,7 +49,7 @@
comma:= ,
empty:=
space:= $(empty) $(empty)
-PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,CernlibSystem)))
+PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,$(filter -DCERNLIB_%,CernlibSystem))))
LDIR=$(TOP)$(CURRENT_DIR)/
$(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
@@ -114,7 +114,7 @@
#ifdef CERNLIB_VAXVMS
-PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,CernlibSystem)))
+PLINAME=$(subst $(space),$(comma),$(strip $(subst -DCERNLIB_,,$(filter -DCERNLIB_%,CernlibSystem))))
LDIR=$(TOP)$(CURRENT_DIR)]
%.for: %.cra patchy.car yyexpand.com
--- NEW FILE cernlib-126-fix-patchy-compile-flags.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 126-fix-patchy-compile-flags.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix various compile flags, etc. in patchy build directory.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/patchy/Imakefile cernlib-2006.dfsg.2/src/patchy/Imakefile
--- cernlib-2006.dfsg.2~/src/patchy/Imakefile 2008-02-26 13:15:48.000000000 -0800
+++ cernlib-2006.dfsg.2/src/patchy/Imakefile 2008-02-26 13:16:06.000000000 -0800
@@ -54,19 +54,9 @@
$(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
ypatchy - p5lib p5lib TTY .go
- fcasplit p5lib.f
- RemoveFile(p5lib.f)
+ ./fcasplit p5lib.f "-c $(FORTRANOPTIONS) $(FDEBUGFLAGS)" "-c $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)" "" "$(FC)" "$(CC)"
cat p5lib.libmake >> p5lib.mkfca
-#if defined(CERNLIB_GFORTRAN)
- sed -e 's;f77;gfortran;' -e 's;g77;gfortran;' -e 's;-Nx800;;' \
- -e 's;-Nc200;;' -e 's;+ppu;;' p5lib.mkfca > p5lib.mkfca.mod
- sed -e 's;f77;gfortran;' -e 's;g77;gfortran;' -e 's;-Nx800;;' \
- -e 's;-Nc200;;' -e 's;+ppu;;' p5lib.shfca > p5lib.shfca.mod
- mv p5lib.mkfca.mod p5lib.mkfca
- mv p5lib.shfca.mod p5lib.shfca
-#endif
$(MAKE) -f p5lib.mkfca $@
- RemoveFile(p5lib.mkfca)
RemoveFile(p5lib.shfca)
p5lib.libmake: Makefile
@@ -78,7 +68,7 @@
echo " rm -f \$$(subst .o,.f,\$$(ROUTINES))" >> $@
fcasplit: fcasplit.o
- $(F77) $< -o $@
+ $(FCLINK) $< -o $@ $(FCLDOPTIONS)
$(LDIR)%.cra: %.cra $(LDIR)yexpand
PLINAME=$(PLINAME);export PLINAME;$(LDIR)yexpand $< $@
@@ -87,22 +77,22 @@
@ ln -s $< $@
%.f: $(LDIR)%.cra $(LDIR)patchy.car
- ypatchy - $@ $< TTY .go
-
+ ypatchy - :$@ :$< TTY .go
+
.f.o:
$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
$(LDIR)yexpand: yexpand.script
- @cp $< $@
- @chmod +x $@
+ cp $< $@
+ chmod +x $@
/* Links to patchy 4.15 */
YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \
ysearch yshift ytobcd ytobin ytoceta
-P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp))
+P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp))
-$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)):
+$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)):
cd $(dir $@); \ @@\
if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\
ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\
diff -urNad cernlib-2006.dfsg.2~/src/patchy/fcasplit.F cernlib-2006.dfsg.2/src/patchy/fcasplit.F
--- cernlib-2006.dfsg.2~/src/patchy/fcasplit.F 1999-11-30 09:37:25.000000000 -0800
+++ cernlib-2006.dfsg.2/src/patchy/fcasplit.F 2008-02-26 13:16:06.000000000 -0800
@@ -343,8 +343,8 @@
PARAMETER (CHIDA = ';DECK I' )
PARAMETER (CHOVER= 'UNKNOWN')
- PARAMETER (CHPOF = '-c -O -fno-automatic')
- PARAMETER (CHPOC = '-c -O2 -m486')
+ PARAMETER (CHPOF = '-c -g -O2 -fno-automatic')
+ PARAMETER (CHPOC = '-c -g -O2')
PARAMETER (CHPOA = ' ')
PARAMETER (CHEXFOR = '.f')
@@ -507,7 +507,7 @@
#endif
PARAMETER (MLMKLN=100)
- PARAMETER (MXLENG=128, MXMKLN=64)
+ PARAMETER (MXLENG=1024, MXMKLN=128)
CHARACTER CHHOLD*(MXLENG)
CHARACTER CHOPT(7)*(MXLENG)
DIMENSION NCHOPT(7)
@@ -532,7 +532,7 @@
DIMENSION LXCBUF(MXCBUF)
CHARACTER*80 CHCBUF(MXCBUF)
- CHARACTER CHLINE*80, CHNAME*80, CHTEXT*511
+ CHARACTER CHLINE*80, CHNAME*80, CHTEXT*3000
CHARACTER CHUSE*1
PARAMETER (NKEYS=11)
--- NEW FILE cernlib-127-yexpand-makes-tmpfiles-in-pwd.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 127-yexpand-makes-tmpfiles-in-pwd.dpatch by Patrice Dumas <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Have yexpand create temp files in $PWD rather than $HOME.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/patchy/yexpand.script cernlib-2006.dfsg.2/src/patchy/yexpand.script
--- cernlib-2006.dfsg.2~/src/patchy/yexpand.script 2005-04-18 08:41:03.000000000 -0700
+++ cernlib-2006.dfsg.2/src/patchy/yexpand.script 2008-02-26 13:18:35.000000000 -0800
@@ -26,8 +26,8 @@
# CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT
CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT
- tfile="$HOME/$tfile.yexp"
- echo "#!/bin/sh" >$tfile
+ tfile="./$tfile.yexp"
+ echo "#! /bin/sh" >$tfile
echo " cat <<EOI" >>$tfile
cat <$ifile >>$tfile
cc=$?
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 27 Feb 2008 01:04:28 -0000 1.11
+++ .cvsignore 24 Mar 2008 23:48:46 -0000 1.12
@@ -1,6 +1,6 @@
+cernlib_2006.dfsg.2-12.diff.gz
2006_src-free.tar.gz
patchy.tar.gz
-geant321_3.21.14.dfsg-7.diff.gz
+paw_2.14.04.dfsg.2-3.diff.gz
mclibs_2006.dfsg.2-5.diff.gz
-paw_2.14.04.dfsg.2-2.diff.gz
-cernlib_2006.dfsg.2-11.diff.gz
+geant321_3.21.14.dfsg-8.diff.gz
Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 315-fixes-for-MacOSX.dpatch 13 Jan 2008 14:09:34 -0000 1.5
+++ 315-fixes-for-MacOSX.dpatch 24 Mar 2008 23:48:46 -0000 1.6
@@ -14,9 +14,9 @@
#ifdef CERNLIB_UNIX
+#ifdef CERNLIB_MACOSX
-+SUBDIRS:= $(SUBDIRS) scripts
++SUBDIRS:= $(SUBDIRS) p5boot scripts
+#else
- SUBDIRS:= $(SUBDIRS) scripts mgr
+ SUBDIRS:= $(SUBDIRS) p5boot scripts mgr
#endif
+#endif
Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cernlib-304-update-Imake-config-files.dpatch 25 Feb 2008 00:56:31 -0000 1.4
+++ cernlib-304-update-Imake-config-files.dpatch 24 Mar 2008 23:48:46 -0000 1.5
@@ -9,14 +9,15 @@
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
--- cernlib-2006.dfsg.2~/src/config/Imake.cf 2006-09-15 02:34:47.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/Imake.cf 2008-01-11 09:52:56.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/Imake.cf 2008-03-12 09:57:41.000000000 -0700
@@ -1,27 +1,5 @@
-/* $Id$
- *
- * $Log$
-- * Revision 1.4 2008/02/25 00:56:31 pertusus
-- * * Sun Feb 24 2008 Patrice Dumas <pertusus at free.fr> 2006-25
-- * - new cernlib and paw patchsets
+- * Revision 1.5 2008/03/24 23:48:46 pertusus
+- * * Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
+- * - new cernlib, paw and geant321 debian patchesets
+- * - use regular p5boot and patchy build
- *
- * Revision 1.6 2006/09/15 09:34:47 mclareni
- * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -1464,7 +1465,7 @@
XCOMM WARNING: Imake.cf not configured; guessing at definitions!!!
diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
--- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf 2006-12-20 06:21:03.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf 2008-01-11 09:36:29.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf 2008-03-12 09:57:41.000000000 -0700
@@ -153,7 +153,7 @@
# define XargsCmd xargs
# define FortranSaveFlags -fno-automatic
@@ -1476,7 +1477,7 @@
diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
--- cernlib-2006.dfsg.2~/src/config/linux.cf 2006-09-15 02:34:48.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/linux.cf 2008-01-11 10:00:21.000000000 -0800
++++ cernlib-2006.dfsg.2/src/config/linux.cf 2008-03-12 09:58:59.000000000 -0700
@@ -68,20 +68,20 @@
#define OSVendor /**/
#define OSMajorVersion 2
@@ -1736,7 +1737,7 @@
+
+#ifdef MipsArchitecture
+# ifndef OptimizationLevel
-+# define OptimizationLevel -O3
++# define OptimizationLevel -O1
+# endif
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags OptimizationLevel
Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cernlib-321-support-gfortran.dpatch 25 Feb 2008 00:56:31 -0000 1.5
+++ cernlib-321-support-gfortran.dpatch 24 Mar 2008 23:48:46 -0000 1.6
@@ -4,13 +4,13 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Support compilation with gfortran. Patch thanks to Harald Vogt, plus:
## DP: - Extra hack to IOSTAT EOF return value to support gfortran-4.3.
-## DP: - Work around gfortran's refusal to initialize 4-byte integer with
-## DP: unsigned constant > 0x7fffffff.
+## DP: - Fix to patchy.car to change default fortran compiler in nyshell
+## DP: in gfortran case.
@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F 1996-04-01 07:01:53.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F 2008-03-13 09:40:04.000000000 -0700
@@ -45,7 +45,16 @@
MT=3
Z(1)=SQRT(SQRT(-D))
@@ -52,7 +52,7 @@
IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F 1996-04-01 07:02:54.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F 2008-03-13 09:40:04.000000000 -0700
@@ -14,10 +14,12 @@
VECTOR(I) = RNDM(I)
100 CONTINUE
@@ -70,7 +70,7 @@
END
diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile 1999-11-15 05:25:58.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile 2008-03-13 09:40:04.000000000 -0700
@@ -13,7 +13,19 @@
#endif
@@ -93,7 +93,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2006-09-04 05:32:59.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile 2008-03-13 09:40:04.000000000 -0700
@@ -1,6 +1,6 @@
-SRCS_F= irndm.F qnext.F rdmin.F
@@ -105,7 +105,7 @@
SubdirLibraryTarget(NullParameter,NullParameter)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F
--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 1969-12-31 16:00:00.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/kernlibgetarg.F 2008-03-13 09:40:04.000000000 -0700
@@ -0,0 +1,19 @@
+* Wrapper GETARG routine for gfortran,
+* originally written by Harald Vogt <hvogt at ifh.de>
@@ -128,7 +128,7 @@
+
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h
--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kfor.h 2006-09-15 02:35:30.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kfor.h 2008-03-13 09:40:05.000000000 -0700
@@ -1031,7 +1031,7 @@
#if !defined(CERNLIB_GFORTRAN)
#define Getarg F77_NAME(getarg,GETARG)
@@ -140,7 +140,7 @@
#define Goparm F77_NAME(goparm,GOPARM)
diff -urNad cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc
--- cernlib-2006.dfsg.2~/src/packlib/zebra/fq/fzdaeof.inc 2006-09-15 02:35:31.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc 2008-02-11 15:40:44.000000000 -0800
++++ cernlib-2006.dfsg.2/src/packlib/zebra/fq/fzdaeof.inc 2008-03-13 09:40:05.000000000 -0700
@@ -46,8 +46,12 @@
#elif defined(CERNLIB_WINDOWS)
* only valid for dec fortran (e.g. not f2c + microsoft c)
@@ -155,3 +155,38 @@
#elif 1
PARAMETER (IOSEOF = -1)
#endif
+diff -urNad cernlib-2006.dfsg.2~/src/patchy/fcasplit.F cernlib-2006.dfsg.2/src/patchy/fcasplit.F
+--- cernlib-2006.dfsg.2~/src/patchy/fcasplit.F 2008-03-13 09:39:39.000000000 -0700
++++ cernlib-2006.dfsg.2/src/patchy/fcasplit.F 2008-03-13 09:40:05.000000000 -0700
+@@ -352,7 +352,11 @@
+ PARAMETER (CHEXAS = '.s')
+ PARAMETER (CHEXOBJ = '.o')
+
++#if defined(CERNLIB_GFORTRAN)
++ PARAMETER (CHWHF = 'gfortran ')
++#else
+ PARAMETER (CHWHF = 'g77 ')
++#endif
+ PARAMETER (CHWHC = 'gcc ')
+ PARAMETER (CHWHA = 'as ')
+ #endif
+diff -urNad cernlib-2006.dfsg.2~/src/patchy/patchy.car cernlib-2006.dfsg.2/src/patchy/patchy.car
+--- cernlib-2006.dfsg.2~/src/patchy/patchy.car 2006-09-04 05:33:00.000000000 -0700
++++ cernlib-2006.dfsg.2/src/patchy/patchy.car 2008-03-13 09:41:01.000000000 -0700
+@@ -25968,10 +25968,14 @@
+ +SELF, IF=QMLNX.
+ CALL SMCIL (-1, 'fo:1' , '-O2')
+ CALL SMCIL (-1, 'fo:2' , '-O0')
+- CALL SMCIL (-1, 'fopt' , '-c -Nx800 -Nc200')
++ CALL SMCIL (-1, 'fopt' , '-c -g')
+ CALL SMCIL (-1, 'co:1' , '-O2')
+ CALL SMCIL (-1, 'co:2' , '-O0')
+- CALL SMCIL (-1, 'copt' , '-c -posix')
++ CALL SMCIL (-1, 'copt' , '-c -g')
++
+++SELF, IF=GFORTRAN.
++ CALL SMCIL (-1, 'fc' , 'gfortran')
++
+ +SELF, IF=QMNXT.
+ +SELF, IF=QMSGI.
+ +SELF, IF=QMSUN.
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cernlib.spec 27 Feb 2008 01:07:59 -0000 1.71
+++ cernlib.spec 24 Mar 2008 23:48:46 -0000 1.72
@@ -55,7 +55,7 @@
Name: %{?compat}cernlib%{?compiler}
Version: 2006
-Release: 27%{?dist}
+Release: 28%{?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.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-11.diff.gz
-Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-2.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-12.diff.gz
+Patch100002: http://ftp.de.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-3.diff.gz
Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz
-Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-7.diff.gz
+Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-8.diff.gz
# change file to directory to DATADIR
Patch1100: cernlib-enforce-FHS.diff
Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -182,6 +182,13 @@
Patch12102: paw-121-call-gfortran-in-cscrexec.dpatch
Patch122: cernlib-122-fix-cdf-file-syntax-errors.dpatch
Patch123: cernlib-123-extern-memmove-only-if-not-macro.dpatch
+Patch124: cernlib-124-integrate-patchy-bootstrap.dpatch
+Patch125: cernlib-125-fix-PLINAME-creation.dpatch
+# correct build, use optflags and have fcasplit handle
+# enough command line arguments (this fcasplit is shipped)
+Patch126: cernlib-126-fix-patchy-compile-flags.dpatch
+# in yexpand don't put temporary files in HOME, but in current directory
+Patch127: cernlib-127-yexpand-makes-tmpfiles-in-pwd.dpatch
Patch200: paw-200-comis-allow-special-chars-in-path.dpatch
Patch201: cernlib-201-update-kuip-helper-apps.dpatch
Patch202: cernlib-202-fix-includes-in-minuit-example.dpatch
@@ -332,14 +339,6 @@
# enough command line arguments (this fcasplit is not shipped)
Patch1507: patchy-use_OPT.patch
-# patchy 5 (included in cernlib)
-# correct build, use optflags and have fcasplit handle
-# enough command line arguments (this fcasplit is shipped)
-Patch1504: npatchy-np_flags.patch
-#Patch1505: patchy-perror.patch
-# in yexpand don't put temporary files in HOME, but in current directory
-Patch1506: npatchy-curdir.patch
-
%description
CERN program library is a large collection of general purpose libraries
and modules maintained and offered on the CERN. Most of these programs
@@ -599,6 +598,10 @@
%patch -P 12102 -p1
%patch -P 122 -p1
%patch -P 123 -p1
+%patch -P 124 -p1
+%patch -P 125 -p1
+%patch -P 126 -p1
+%patch -P 127 -p1
%patch -P 200 -p1
%patch -P 201 -p1
%patch -P 202 -p1
@@ -769,9 +772,9 @@
%patch -P 80702 -p1
%patch -P 80703 -p1
-%patch -P 1504 -p2 -b .np_flags
+#%patch -P 1504 -p2 -b .np_flags
#%patch -P 1505 -p1
-%patch -P 1506 -p2 -b .curdir
+#%patch -P 1506 -p2 -b .curdir
%patch -P 1201
@@ -950,6 +953,10 @@
# %{?_smp_mflags} breaks the builds
make bin/kuipc
make scripts/Makefile
+# make Makefiles that are not done automatically now
+make p5boot/Makefile
+make patchy/Makefile
+
cd scripts
make install.bin
@@ -973,6 +980,8 @@
$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
`cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
+
+
# Build packlib
cd $CERN_ROOT/build/packlib
make install.bin
@@ -980,27 +989,15 @@
cd $CERN_ROOT/build/graflib
make install.bin
-# bootstrap npatchy
-mkdir -p $CERN_ROOT/build/p5boot
cd $CERN_ROOT/build/p5boot
-cp -p -r $CERN_ROOT/src/p5boot/* .
-# there is a main program in this file, so the file is removed.
-rm p5lib/nsynopt.f
-$FC_COMPILER $FC_OPTFLAGS $G_LDFLAGS -o nypatchy nypatchy.f p5lib/*.f $CERN_ROOT/lib/libkernlib.a
-ln -s $CERN_ROOT/build/p5boot/nypatchy $CERN_ROOT/bin/ypatchy
+make install.bin
-# Build npatchy
-%if %{with gfortran}
- sed -i.gfortran -e 's/g77/gfortran/' $CERN_ROOT/src/patchy/fcasplit.F
-%endif
-cd $CERN_ROOT/build
-make patchy/Makefile
-cd patchy
# we cannot use %%{?_smp_mflags} because fcasplit is used after being
# built, and during the fcasplit installation (which is done in parallel
# with the build) it is removed and replaced by a symlink, and if it
# takes time the link may not be there on time.
# At least that's my understanding of the failure.
+cd $CERN_ROOT/build/patchy
make install.bin
# it is not completly obvious that it is better to use patchy 4 for
@@ -1013,8 +1010,6 @@
rm -rf %{buildroot}
%{__install} -d -m755 %{buildroot}%{_sysconfdir}/profile.d
-#%{__install} -p -m644 cernlib-%{verdir}.sh %{buildroot}%{_sysconfdir}/profile.d
-#%{__install} -p -m644 cernlib-%{verdir}.csh %{buildroot}%{_sysconfdir}/profile.d
%{__install} -d -m755 cfortran/Examples
%{__install} -p -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
@@ -1141,7 +1136,7 @@
%{__install} -d -m755 %{buildroot}/%{_mandir}/man1
%{__install} -p -m644 man/man1/cernlib.1 %{buildroot}/%{_mandir}/man1/cernlib-static.1
-for cernlib_manpage in cernlib.1 kxterm.1 dzedit.1 dzeX11.1 kuipc.1 kuesvr.1 zftp.1 gxint.1 paw.1 paw++.1 pawX11.1; do
+for cernlib_manpage in cernlib.1 kxterm.1 dzedit.1 dzeX11.1 kuipc.1 kuesvr.1 zftp.1 gxint.1 paw.1 paw++.1 pawX11.1 yexpand.1 ypatchy.1 ny*.1; do
%{__install} -p -m644 ../../*/debian/add-ons/manpages/$cernlib_manpage %{buildroot}/%{_mandir}/man1/
done
@@ -1197,9 +1192,6 @@
# no test in code_motif paw_motif scripts patchy pawlib
test_dirs='graflib mclibs kernlib mathlib packlib phtools geant321'
-#%ifnarch x86_64 ppc64
-#test_dirs="$test_dirs geant321"
-#%endif
rm -f __dist_failed_builds
for dir in $test_dirs; do
@@ -1361,6 +1353,9 @@
%{_bindir}/ytobcd%{?compiler_string}
%{_bindir}/ytobin%{?compiler_string}
%{_bindir}/ytoceta%{?compiler_string}
+%{_mandir}/man1/ny*.1*
+%{_mandir}/man1/yexpand.1*
+%{_mandir}/man1/ypatchy.1*
%if 0%{?utils_compiler}
%files -n paw
@@ -1439,9 +1434,16 @@
%{_bindir}/ytobcd
%{_bindir}/ytobin
%{_bindir}/ytoceta
+%{_mandir}/man1/ny*.1*
+%{_mandir}/man1/yexpand.1*
+%{_mandir}/man1/ypatchy.1*
%endif
%changelog
+* Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
+- new cernlib, paw and geant321 debian patchesets
+- use regular p5boot and patchy build
+
* Tue Feb 26 2008 Patrice Dumas <pertusus at free.fr> 2006-27
- new mclibs and geant321 patchsets
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Feb 2008 01:04:28 -0000 1.12
+++ sources 24 Mar 2008 23:48:46 -0000 1.13
@@ -1,6 +1,6 @@
+51fbf1feea2e9040464a3e7af19e7097 cernlib_2006.dfsg.2-12.diff.gz
fe71a3f6b95ff2151c5a4690116a0358 2006_src-free.tar.gz
b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz
-9a19d3bd4bd63c0ee2431c8d28f308b9 geant321_3.21.14.dfsg-7.diff.gz
+d8e01253d4cd737d63962003b612326c paw_2.14.04.dfsg.2-3.diff.gz
c65e057e938076f73645a193d497aaf4 mclibs_2006.dfsg.2-5.diff.gz
-5e99d1d8d0e632475879e12afe6ad748 paw_2.14.04.dfsg.2-2.diff.gz
-f8628a35f2a422dfaf09edc526d448e9 cernlib_2006.dfsg.2-11.diff.gz
+c73b0d68cd39bce7d2d84fe6be6cd14d geant321_3.21.14.dfsg-8.diff.gz
--- npatchy-curdir.patch DELETED ---
--- npatchy-np_flags.patch DELETED ---
More information about the fedora-extras-commits
mailing list