rpms/pvm/FC-3 pvm-3.4.5-ppc64arch.patch, NONE, 1.1 pvm-3.4.5-Pvmtev.patch, NONE, 1.1 pvm.spec, 1.22, 1.23 sources, 1.5, 1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 1 21:14:47 UTC 2005
Author: jvdias
Update of /cvs/dist/rpms/pvm/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv8339
Modified Files:
pvm.spec sources
Added Files:
pvm-3.4.5-ppc64arch.patch pvm-3.4.5-Pvmtev.patch
Log Message:
fix bugs 155785, 158303
pvm-3.4.5-ppc64arch.patch:
pvmgetarch | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE pvm-3.4.5-ppc64arch.patch ---
--- pvm3/lib/pvmgetarch.ppc64arch 2005-05-31 18:49:56.000000000 -0400
+++ pvm3/lib/pvmgetarch 2005-05-31 18:52:17.000000000 -0400
@@ -75,6 +75,7 @@
Linux,sparc* ) ARCH=LINUXSPARC ;;
Linux,hp_pa ) ARCH=LINUXHPPA ;;
Linux,ppc ) ARCH=LINUXPPC ;;
+ Linux,ppc64 ) ARCH=LINUXPPC64 ;;
Linux,s390 ) ARCH=LINUXS390 ;;
Linux,s390x ) ARCH=LINUXS390X ;;
Linux,m68k ) ARCH=LINUXATARI ;;
pvm-3.4.5-Pvmtev.patch:
global.h | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE pvm-3.4.5-Pvmtev.patch ---
--- pvm3/src/global.h.Pvmtev 2001-02-07 18:14:03.000000000 -0500
+++ pvm3/src/global.h 2005-03-08 17:00:57.000000000 -0500
@@ -317,6 +317,7 @@
/* General Trace Globals Declarations */
+#include <pvmtev.h>
extern struct Pvmtevdid pvmtevdidlist[];
Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/FC-3/pvm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pvm.spec 25 Feb 2005 19:09:41 -0000 1.22
+++ pvm.spec 1 Jun 2005 21:14:45 -0000 1.23
@@ -1,7 +1,7 @@
Summary: Libraries for distributed computing.
Name: pvm
Version: 3.4.5
-Release: 2_FC3
+Release: 5_FC3
License: freely distributable
Group: Development/Libraries
Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -22,6 +22,8 @@
Patch5: xpvm-1.2.5-envvars.patch
Patch6: pvm3.4.5-x86_64-segfault.patch
Patch7: pvm-3.4.5-bug_147337.patch
+Patch8: pvm-3.4.5-Pvmtev.patch
+Patch9: pvm-3.4.5-ppc64arch.patch
URL: http://www.epm.ornl.gov/pvm/pvm_home.html
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: initscripts >= 5.54, bash >= 2
@@ -60,6 +62,16 @@
%patch4 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+# Patch the LINUX*64.def files to look in lib64 dirs as well for libraries.
+perl -p -i -e "s|ARCHDLIB[ \ ]*=|ARCHDLIB = -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX64.def
+perl -p -i -e "s|ARCHLIB[ \ ]*=|ARCHLIB = -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX64.def
+%ifarch x86_64
+echo 'ARCHCFLAGS += -fPIC' >> conf/LINUX64.def
+%endif
+
cp conf/LINUX.def conf/LINUXS390.def
cp conf/LINUX.m4 conf/LINUXS390.m4
cp conf/LINUX.def conf/LINUXI386.def
@@ -73,21 +85,17 @@
cp conf/LINUX64.def conf/LINUXPPC64.def
cp conf/LINUX64.m4 conf/LINUXPPC64.m4
-# Patch the LINUXX86_64.def file to look in lib64 dirs as well for libraries.
-for I in X86_64 ppc64 s390x; do
-perl -p -i -e "s|ARCHDLIB =|ARCHDLIB = -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
-perl -p -i -e "s|ARCHLIB =|ARCHLIB = -L/usr/lib64 -L/usr/X11R6/lib64|" conf/LINUX$I.def
-done
-%define pvm_arch %(echo %{_os}%{_target_cpu} | tr 'a-z' 'A-Z')
+#%define pvm_arch %(echo %{_os}%{_target_cpu} | tr 'a-z' 'A-Z')
%build
PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
- PVM_ARCH=%{pvm_arch} \
+ PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
PVM_DPATH=$RPM_BUILD_ROOT/usr/share/pvm3/lib/pvmd \
+ CFLAGS=-fPIC \
make -C $RPM_BUILD_ROOT/usr/share/pvm3
PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
- PVM_ARCH=%{pvm_arch} \
+ PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
XPVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3/xpvm \
make -C $RPM_BUILD_ROOT/usr/share/pvm3/xpvm XLIBDIR=-L%{_prefix}/X11R6/%{_lib} TCLTKHOME=%{_libdir}
@@ -98,7 +106,7 @@
mkdir -p $RPM_BUILD_ROOT/usr/bin
install -m 0755 $RPM_SOURCE_DIR/xpvm.sh $RPM_BUILD_ROOT/usr/bin/xpvm
PVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3 \
- PVM_ARCH=%{pvm_arch} \
+ PVM_ARCH=`/var/tmp/pvm-3.4.5-root/usr/share/pvm3/lib/pvmgetarch` \
XPVM_ROOT=$RPM_BUILD_ROOT/usr/share/pvm3/xpvm \
make -C $RPM_BUILD_ROOT/usr/share/pvm3/xpvm install
@@ -197,7 +205,6 @@
# /usr/sbin/userdel pvm > /dev/null 2>&1
#fi
-
%triggerun -- pvm <= 3.4.3-25
/sbin/chkconfig --del pvmd
@@ -218,9 +225,17 @@
/usr/share/pvm3/xpvm/*
%changelog
-* Fri Feb 25 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-2_FC3
+* Tue May 31 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-4
+- fix bug 158303: x86_64 build needs -fPIC
+- fix bug 155785: PVM_ARCH should be LINUX on i386, not LINUXI386
+ add LINUXPPC64 arch to pvmgetarch
+
+* Tue Mar 08 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-3_FC4
+- GCC4 build: fix forward declaration of Pvmtevdid (globals.h)
+
+* Fri Feb 25 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-2_FC4
- Fix bug 147337 - invalid format string in pvmlog.c
-- make version compare < that of FC4
+- make version compare > that of FC3
* Wed Feb 02 2005 Jason Vas Dias<jvdias at redhat.com> 3.4.5-1
- Upgrade to upstream version 3.4.5 (bug 143156).
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pvm/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 2 Feb 2005 22:22:01 -0000 1.5
+++ sources 1 Jun 2005 21:14:45 -0000 1.6
@@ -1,3 +1,2 @@
7b20143cb2ff61e3cb28baf8f9cb2770 XPVM.src.1.2.5.tgz
-806abe9a866eab5981383c17ff9ed175 pvm3.4.4.tgz
086e6d707b40adba04bddba8e5b6b17d pvm3.4.5.tgz
More information about the fedora-cvs-commits
mailing list