rpms/cernlib/FC-3 211-fix-comis-on-amd64.dpatch, 1.1, 1.2 cernlib.spec, 1.18, 1.19 paw.README, 1.4, 1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Thu May 25 09:09:57 UTC 2006
Author: pertusus
Update of /cvs/extras/rpms/cernlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1891/FC-3
Modified Files:
211-fix-comis-on-amd64.dpatch cernlib.spec paw.README
Log Message:
* Wed May 24 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-21
- compile paw statically against the cernlib (paw binaries dynamically
compiled against the cernlib are still shiped). Fix 192866
Index: 211-fix-comis-on-amd64.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/211-fix-comis-on-amd64.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 211-fix-comis-on-amd64.dpatch 15 Dec 2005 12:07:03 -0000 1.1
+++ 211-fix-comis-on-amd64.dpatch 25 May 2006 09:09:57 -0000 1.2
@@ -396,8 +396,8 @@
ITMPLEN=CSTMPD(CHPATH, 256)
- CHF77 ='g77 -c'
- CHCC ='cc -c'
-+ CHF77 ='g77 -c -fPIC'
-+ CHCC ='cc -c -fPIC'
++ CHF77 ='g77 -g -c -fPIC'
++ CHCC ='cc -g -c -fPIC'
#endif
#if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
ITMPLEN=CSTMPD(CHPATH, 256)
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cernlib.spec 17 May 2006 21:00:13 -0000 1.18
+++ cernlib.spec 25 May 2006 09:09:57 -0000 1.19
@@ -1,6 +1,6 @@
Name: cernlib
Version: 2005
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: General purpose CERN library and associated binaries
Group: Development/Libraries
# As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -651,9 +651,17 @@
make install.shlib
chmod a+x ../shlib/*.so.*
-# Build paw
+# Build dynamic paw
cd $CERN_ROOT/build/pawlib
make %{?_smp_mflags} install.bin
+cd $CERN_ROOT/
+mv bin/pawX11 bin/pawX11.dynamic
+mv bin/paw++ bin/paw++.dynamic
+# Build static paw
+g77 $CERN_ROOT/build/pawlib/paw/programs/0pamain.o \
+ `cernlib -G X11 pawlib` -Wl,-E -o bin/pawX11
+g77 $CERN_ROOT/build/pawlib/paw/programs/0pamainm.o \
+ `cernlib -G Motif pawlib` -Wl,-E -o bin/paw++
# Build packlib
cd $CERN_ROOT/build/packlib
@@ -768,6 +776,8 @@
%{_bindir}/paw++
%{_bindir}/paw
%{_bindir}/pawX11
+%{_bindir}/pawX11.dynamic
+%{_bindir}/paw++.dynamic
%dir %{_libdir}/cernlib/%{version}/bin
%{_libdir}/cernlib/%{version}/bin/pawX11
%doc paw.README
@@ -830,6 +840,10 @@
%changelog
+* Wed May 24 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-21
+- compile paw statically against the cernlib (paw binaries dynamically
+ compiled against the cernlib are still shiped). Fix 192866
+
* Wed May 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-20
- use new debian patchset. Fix 191631
Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/paw.README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- paw.README 17 May 2006 21:00:13 -0000 1.4
+++ paw.README 25 May 2006 09:09:57 -0000 1.5
@@ -41,11 +41,20 @@
to the beginning of them.
-5) Shared libs
+5) Shared and static libs
-PAW is linked dynamically, therefore the pawlib used is selected by the
+There are 2 sets of binaries installed. In one set the binaries are
+statically linked with the cernlib (but still dynamically linked with
+the other libraries), these are the binaries used in the default case
+(pawX11 and paw++).
+
+The other binaries are compiled dynamically (pawX11.dynamic and
+paw++.dynamic), therefore the pawlib used is selected by the
/etc/ld.so.conf or $LD_LIBRARY_PATH settings.
+The statically compiled one are used in the default case because
+dynamically linked one fail on some 64 bit architectures.
+
-- Kevin McCarty <kmccarty at debian.org>, Tue, 22 Nov 2005
Adapted to the rpm package by
More information about the fedora-extras-commits
mailing list