rpms/pvm/FC-4 pvm-3.4.5-ppc64arch.patch, NONE, 1.1 pvm.spec, 1.25, 1.26

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/pvm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14849

Modified Files:
	pvm.spec 
Added Files:
	pvm-3.4.5-ppc64arch.patch 
Log Message:
fix bugs 158303 155785

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 ;;


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/FC-4/pvm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pvm.spec	8 Mar 2005 22:11:13 -0000	1.25
+++ pvm.spec	1 Jun 2005 18:10:26 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 3_FC4
+Release: 4_FC4
 License: freely distributable
 Group: Development/Libraries
 Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -23,6 +23,7 @@
 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
@@ -62,6 +63,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 cp conf/LINUX.def conf/LINUXS390.def
 cp conf/LINUX.m4 conf/LINUXS390.m4
 cp conf/LINUX.def conf/LINUXI386.def
@@ -76,20 +78,26 @@
 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
+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')
+%ifarch x86_64
+echo 'ARCHCFLAGS += -fPIC' >> conf/LINUXX86_64.def
+echo 'ARCHCFLAGS += -fPIC' >> conf/LINUX64.def
+%endif
+
+#%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} 
 
@@ -100,7 +108,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
 
@@ -199,7 +207,6 @@
 #    /usr/sbin/userdel pvm > /dev/null 2>&1
 #fi
 
-
 %triggerun -- pvm <= 3.4.3-25
 /sbin/chkconfig --del pvmd
 
@@ -220,6 +227,11 @@
 /usr/share/pvm3/xpvm/*
 
 %changelog
+* 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)