rpms/cernlib/FC-3 cernlib-cernlib_kernlib.patch, NONE, 1.1 cernlib.spec, 1.7, 1.8
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Fri Dec 9 16:06:06 UTC 2005
- Previous message: rpms/cernlib/FC-3 001-fix-missing-fluka.dpatch, NONE, 1.1 002-fix-missing-mclibs.dpatch, NONE, 1.1 003-geant-dummy-functions.dpatch, NONE, 1.1 100-fix-isajet-manual-corruption.dpatch, NONE, 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch, NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE, 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE, 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE, 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE, 1.1 107-define-strdup-macro-safely.dpatch, NONE, 1.1 108-quote-protect-comis-script.dpatch, NONE, 1.1 110-ignore-included-lapack-rule.dpatch, NONE, 1.1 111-fix-kuesvr-install-location.dpatch, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE, 1.1 113-cups-postscript-fix.dpatch, NONE, 1.1 114-install-scripts-properly.dpatch, NONE, 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE, 1.1 201-update-kuip-helper-apps.dpatch, NONE, 1.1 202-fix-includes-in-minuit-example.dpatch, NONE, 1.1 203-compile-geant-wi! th-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE, 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE, 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE, 1.1 210-improve-cfortran-header-files.dpatch, NONE, 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE, 1.1 300-skip-duplicate-lenocc.dpatch, NONE, 1.1 303-shadow-passwords-supported.dpatch, NONE, 1.1 304-update-Imake-config-files.dpatch, NONE, 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE, 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE, 1.1 307-use-canonical-cfortran.dpatch, NONE, 1.1 308-use-canonical-cfortran-location.dpatch, NONE, 1.1 309-define-dummy-herwig-routines.dpatch, NONE, 1.1 310-define-dummy-fowl-routines.dpatch, NONE, 1.1 311-skip-duplicate-qnext.dpatch, NONE, 1.1 312-skip-duplicate-gamma.dpatch, NONE, 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-usi! ng-regcomp-for-re_comp.dpatch,NONE,1.1 315-fixes-for-MacOSX.dp! atch,N
- Next message: rpms/cernlib/FC-4 003-geant-dummy-functions.dpatch, NONE, 1.1 100-fix-isajet-manual-corruption.dpatch, NONE, 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch, NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE, 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE, 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE, 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE, 1.1 107-define-strdup-macro-safely.dpatch, NONE, 1.1 108-quote-protect-comis-script.dpatch, NONE, 1.1 110-ignore-included-lapack-rule.dpatch, NONE, 1.1 111-fix-kuesvr-install-location.dpatch, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE, 1.1 113-cups-postscript-fix.dpatch, NONE, 1.1 114-install-scripts-properly.dpatch, NONE, 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE, 1.1 201-update-kuip-helper-apps.dpatch, NONE, 1.1 202-fix-includes-in-minuit-example.dpatch, NONE, 1.1 203-compile-geant-with-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-! max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE, 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE, 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE, 1.1 210-improve-cfortran-header-files.dpatch, NONE, 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE, 1.1 300-skip-duplicate-lenocc.dpatch, NONE, 1.1 303-shadow-passwords-supported.dpatch, NONE, 1.1 304-update-Imake-config-files.dpatch, NONE, 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE, 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE, 1.1 307-use-canonical-cfortran.dpatch, NONE, 1.1 308-use-canonical-cfortran-location.dpatch, NONE, 1.1 309-define-dummy-herwig-routines.dpatch, NONE, 1.1 310-define-dummy-fowl-routines.dpatch, NONE, 1.1 311-skip-duplicate-qnext.dpatch, NONE, 1.1 312-skip-duplicate-gamma.dpatch, NONE, 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-using-regcomp-for-re_comp.dpatch, NONE, 1.1 315-fixes-for-MacOSX.dpatch, NONE, 1.1 3! 18-additional-gcc-3.4-fixes.dpatch,NONE,1.1 701-patch-hbook-co! mis-Im
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26100
Modified Files:
cernlib.spec
Added Files:
cernlib-cernlib_kernlib.patch
Log Message:
in fact the 64 bit fixes are included, and a patch was missing
cernlib-cernlib_kernlib.patch:
--- NEW FILE cernlib-cernlib_kernlib.patch ---
--- src/scripts/cernlib-old 2005-11-30 20:15:23.000000000 +0100
+++ src/scripts/cernlib 2005-11-30 20:15:23.000000000 +0100
@@ -16,12 +16,16 @@
[ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
_P=0 ; _p=0 ; _u=0 ; Gsys=""
+ #default is to use dynamic lapack
+ _l=1 ;
+ dynlapack=0;
while [ $# -gt 0 ]
do case $1 in
-G) Gsys=$2 ; shift ;;
-P) _P=1 ;;
-s) _s="is an obsolete option" ;;
-u) _u=1 ; _p=1 ;;
+ -l) _l=0 ;;
-v) gver=$2 ; shift ;;
--) shift ; break ;;
*) break ;;
@@ -46,14 +50,29 @@
[ $# -eq 2 -a $1 != "graflib" ] && lver=$2
dir=$CERN/$lver/lib
ln=$1
- if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
+ if [ $1 = "kernlib" ]; then
_p=1
fi
+ if [ $1 = "packlib" ]; then
+ _p=1
+ ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
+ fi
[ $1 = "genlib" ] && ln="mathlib.a $dir/libphtools"
[ $1 = "bvsl" ] && ln="mathlib"
[ $1 = "mpalib" ] && ln="mathlib"
- [ $1 = "lapack" ] && ln="lapack3.a $dir/libblas"
- [ $1 = "pawlib" ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+ if [ $_l -eq 0 ] ; then
+ [ $1 = "pawlib" ] && ln="pawlib-lesstif.a $dir/libpawlib.a $dir/liblapack3.a $dir/libblas"
+ [ $1 = "lapack" ] && ln="lapack3.a $dir/libblas"
+ else
+ if [ $1 = "pawlib" ] ; then
+ ln="pawlib-lesstif.a $dir/libpawlib"
+ dynlapack=1
+ fi
+ if [ $1 = "lapack" ] ; then
+ ln=""
+ dynlapack=1
+ fi
+ fi
[ $1 = "pythia" ] && ln="jetset"
if [ $1 = "GKS" -o $1 = "gks" ] ; then
drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
@@ -69,9 +88,9 @@
[ $drv = "Motif" ] && drv="X11"
ln="$ln.a $dir/libgraf$drv"
fi
- CERNLIB="$CERNLIB $dir/lib$ln.a"
+ [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
done
- [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
+ [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
# get system name
[ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
@@ -110,10 +129,14 @@
SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
SYSGMOTIF="-lXm -lXt -lX11 -lPW"
;;
- Linux) [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+ Linux) SYSGX11="-lX11"
+ SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
+ [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
[ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
[ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
+ [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
[ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
+ [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 -lXm -lXt -lXp -lXext -lX11"
[ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
;;
NeXT) SYSGX11="/usr/lib/X11/libX11.r" ;
@@ -208,6 +231,10 @@
fi
if [ "$Msys" = "Linux" ] ; then
CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
+# echo $CERNLIB | grep pawlib >/dev/null && CERNLIB="$CERNLIB -llapack -lblas"
+ fi
+ if [ $dynlapack = 1 ] ; then
+ CERNLIB="$CERNLIB -llapack -lblas"
fi
fi
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cernlib.spec 9 Dec 2005 15:57:06 -0000 1.7
+++ cernlib.spec 9 Dec 2005 16:06:04 -0000 1.8
@@ -1,6 +1,6 @@
Name: cernlib
Version: 2005
-Release: 8%{?dist}
+Release: 8%{?dist}.1
Summary: General purpose CERN library and associated binaries
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,7 +12,12 @@
#BuildRequires: gcc-g77
#Requires: libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
# fedora core
-BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 3
+BuildRequires: xorg-x11-devel lapack blas openmotif-devel
+# fc 4
+BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel
+# fc devel
+#BuildRequires: imake lapack-devel blas-devel openmotif-devel
# there are missing f2c intrinsics in gfortran so gfortran cannot be used to
# build the cernlib
#BuildRequires: imake lapack-devel blas-devel openmotif-devel
@@ -687,8 +692,9 @@
%doc debian/debhelper/zftp.README.debian
%changelog
-* Fri Dec 9 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-8
+* Fri Dec 9 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-8.1
- update with newer debian patchset for cernlib, fix licence issues
+- enable 64 bit fixes patch
- remove the BSD in the licence because there is no library nor binary
under a BSD licence and someone could get the idea that there is
some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
- Previous message: rpms/cernlib/FC-3 001-fix-missing-fluka.dpatch, NONE, 1.1 002-fix-missing-mclibs.dpatch, NONE, 1.1 003-geant-dummy-functions.dpatch, NONE, 1.1 100-fix-isajet-manual-corruption.dpatch, NONE, 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch, NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE, 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE, 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE, 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE, 1.1 107-define-strdup-macro-safely.dpatch, NONE, 1.1 108-quote-protect-comis-script.dpatch, NONE, 1.1 110-ignore-included-lapack-rule.dpatch, NONE, 1.1 111-fix-kuesvr-install-location.dpatch, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE, 1.1 113-cups-postscript-fix.dpatch, NONE, 1.1 114-install-scripts-properly.dpatch, NONE, 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE, 1.1 201-update-kuip-helper-apps.dpatch, NONE, 1.1 202-fix-includes-in-minuit-example.dpatch, NONE, 1.1 203-compile-geant-wi! th-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE, 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE, 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE, 1.1 210-improve-cfortran-header-files.dpatch, NONE, 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE, 1.1 300-skip-duplicate-lenocc.dpatch, NONE, 1.1 303-shadow-passwords-supported.dpatch, NONE, 1.1 304-update-Imake-config-files.dpatch, NONE, 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE, 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE, 1.1 307-use-canonical-cfortran.dpatch, NONE, 1.1 308-use-canonical-cfortran-location.dpatch, NONE, 1.1 309-define-dummy-herwig-routines.dpatch, NONE, 1.1 310-define-dummy-fowl-routines.dpatch, NONE, 1.1 311-skip-duplicate-qnext.dpatch, NONE, 1.1 312-skip-duplicate-gamma.dpatch, NONE, 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-usi! ng-regcomp-for-re_comp.dpatch,NONE,1.1 315-fixes-for-MacOSX.dp! atch,N
- Next message: rpms/cernlib/FC-4 003-geant-dummy-functions.dpatch, NONE, 1.1 100-fix-isajet-manual-corruption.dpatch, NONE, 1.1 101-undefine-PPC.dpatch, NONE, 1.1 102-dont-optimize-some-code.dpatch, NONE, 1.1 103-ignore-overly-long-macro-in-gen.h.dpatch, NONE, 1.1 104-fix-undefined-insertchar-warning.dpatch, NONE, 1.1 105-fix-obsolete-xmfontlistcreate-warning.dpatch, NONE, 1.1 106-fix-paw++-menus-in-lesstif.dpatch, NONE, 1.1 107-define-strdup-macro-safely.dpatch, NONE, 1.1 108-quote-protect-comis-script.dpatch, NONE, 1.1 110-ignore-included-lapack-rule.dpatch, NONE, 1.1 111-fix-kuesvr-install-location.dpatch, NONE, 1.1 112-remove-nonexistent-prototypes-from-gen.h.dpatch, NONE, 1.1 113-cups-postscript-fix.dpatch, NONE, 1.1 114-install-scripts-properly.dpatch, NONE, 1.1 200-comis-allow-special-chars-in-path.dpatch, NONE, 1.1 201-update-kuip-helper-apps.dpatch, NONE, 1.1 202-fix-includes-in-minuit-example.dpatch, NONE, 1.1 203-compile-geant-with-ertrak.dpatch, NONE, 1.1 204-compile-isajet-with-isasrt.dpatch, NONE, 1.1 205-! max-path-length-to-256.dpatch, NONE, 1.1 206-herwig-uses-DBLE-not-REAL.dpatch, NONE, 1.1 207-compile-temp-libs-with-fPIC.dpatch, NONE, 1.1 208-fix-redundant-packlib-dependencies.dpatch, NONE, 1.1 209-ignore-unneeded-headers-in-kmutil.c.dpatch, NONE, 1.1 210-improve-cfortran-header-files.dpatch, NONE, 1.1 211-fix-comis-on-64-bit-arches.dpatch, NONE, 1.1 300-skip-duplicate-lenocc.dpatch, NONE, 1.1 303-shadow-passwords-supported.dpatch, NONE, 1.1 304-update-Imake-config-files.dpatch, NONE, 1.1 305-use-POWERPC-not-PPC-as-test.dpatch, NONE, 1.1 306-patch-assert.h-for-makedepend.dpatch, NONE, 1.1 307-use-canonical-cfortran.dpatch, NONE, 1.1 308-use-canonical-cfortran-location.dpatch, NONE, 1.1 309-define-dummy-herwig-routines.dpatch, NONE, 1.1 310-define-dummy-fowl-routines.dpatch, NONE, 1.1 311-skip-duplicate-qnext.dpatch, NONE, 1.1 312-skip-duplicate-gamma.dpatch, NONE, 1.1 313-comis-preserves-filename-case.dpatch, NONE, 1.1 314-permit-using-regcomp-for-re_comp.dpatch, NONE, 1.1 315-fixes-for-MacOSX.dpatch, NONE, 1.1 3! 18-additional-gcc-3.4-fixes.dpatch,NONE,1.1 701-patch-hbook-co! mis-Im
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list