rpms/tachyon/devel tachyon-rpm.patch,1.3,1.4 tachyon.spec,1.4,1.5
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sat Jul 14 12:25:10 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15664
Modified Files:
tachyon-rpm.patch tachyon.spec
Log Message:
- add support for ppc64 and sparc64, simplify target setting
tachyon-rpm.patch:
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tachyon-rpm.patch 17 Dec 2006 01:36:38 -0000 1.3
+++ tachyon-rpm.patch 14 Jul 2007 12:25:07 -0000 1.4
@@ -1,5 +1,5 @@
---- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100
-+++ tachyon/unix/Make-arch 2006-12-17 00:42:01.000000000 +0100
+--- tachyon/unix/Make-arch.r 2007-02-13 10:00:36.000000000 +0100
++++ tachyon/unix/Make-arch 2007-07-14 14:22:32.000000000 +0200
@@ -15,7 +15,7 @@
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -9,7 +9,7 @@
MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
default:
-@@ -915,7 +915,7 @@
+@@ -983,7 +983,7 @@
"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -18,7 +18,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-@@ -927,7 +927,7 @@
+@@ -1007,7 +1007,7 @@
"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -27,7 +27,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-@@ -936,10 +936,10 @@
+@@ -1029,10 +1029,10 @@
$(MAKE) all \
"ARCH = linux-64-thr" \
"CC = gcc" \
@@ -40,7 +40,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-@@ -1035,10 +1035,10 @@
+@@ -1128,10 +1128,10 @@
$(MAKE) all \
"ARCH = linux-thr" \
"CC = gcc" \
@@ -53,7 +53,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-@@ -1047,7 +1047,7 @@
+@@ -1140,7 +1140,7 @@
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
@@ -62,7 +62,7 @@
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
-@@ -1081,37 +1081,61 @@
+@@ -1174,37 +1174,61 @@
linux-lam:
$(MAKE) all \
"ARCH = linux-lam" \
@@ -122,8 +122,7 @@
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
@@ -135,12 +134,13 @@
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
# Linux x86 using LAM MPI and threads
linux-lam-thr:
-@@ -1149,6 +1173,114 @@
+@@ -1242,6 +1266,234 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -192,6 +192,66 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
++# Linux PPC64 using gcc
++linux-ppc64:
++ $(MAKE) all \
++ "ARCH = linux-ppc64" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = strip" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux PPC64 using gcc and threads
++linux-ppc64-thr:
++ $(MAKE) all \
++ "ARCH = linux-ppc64-thr" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux PPC64 using threads with OpenGL display
++linux-ppc64-thr-ogl:
++ $(MAKE) all \
++ "ARCH = linux-ppc64-thr-ogl" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux PPC64 using LAM MPI
++linux-ppc64-lam:
++ $(MAKE) all \
++ "ARCH = linux-ppc64-lam" \
++ "CC = mpicc" \
++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++
++# Linux PPC64 using LAM MPI, with OpenGL display
++linux-ppc64-lam-ogl:
++ $(MAKE) all \
++ "ARCH = linux-ppc64-lam-ogl" \
++ "CC = mpicc" \
++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
+# Linux SPARC using gcc
+linux-sparc:
+ $(MAKE) all \
@@ -252,11 +312,71 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
++# Linux SPARC64 using gcc
++linux-sparc64:
++ $(MAKE) all \
++ "ARCH = linux-sparc64" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = strip" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux SPARC64 using gcc and threads
++linux-sparc64-thr:
++ $(MAKE) all \
++ "ARCH = linux-sparc64-thr" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC64 using threads with OpenGL display
++linux-sparc64-thr-ogl:
++ $(MAKE) all \
++ "ARCH = linux-sparc64-thr-ogl" \
++ "CC = gcc" \
++ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC64 using LAM MPI
++linux-sparc64-lam:
++ $(MAKE) all \
++ "ARCH = linux-sparc64-lam" \
++ "CC = mpicc" \
++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++
++# Linux SPARC64 using LAM MPI, with OpenGL display
++linux-sparc64-lam-ogl:
++ $(MAKE) all \
++ "ARCH = linux-sparc64-lam-ogl" \
++ "CC = mpicc" \
++ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++
# Linux PPC using gcc
linux-ps2:
$(MAKE) all \
---- tachyon/unix/Make-config.r 2004-03-05 20:41:03.000000000 +0100
-+++ tachyon/unix/Make-config 2006-12-17 00:37:45.000000000 +0100
+--- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-config 2007-07-14 14:18:14.000000000 +0200
@@ -57,7 +57,7 @@
##########################################################################
@@ -308,8 +428,8 @@
##########################################################################
---- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100
-+++ tachyon/unix/Make-opengl 2006-12-17 00:37:45.000000000 +0100
+--- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100
++++ tachyon/unix/Make-opengl 2007-07-14 14:18:14.000000000 +0200
@@ -9,8 +9,8 @@
#
# Generic Mesa OpenGL / GLX include and link specs, for most platforms
Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tachyon.spec 7 Jul 2007 22:41:23 -0000 1.4
+++ tachyon.spec 14 Jul 2007 12:25:07 -0000 1.5
@@ -4,17 +4,14 @@
%ifarch x86_64
%define target linux-64
%endif
-%ifarch ppc
-%define target linux-ppc
-%endif
-%ifarch sparc
-%define target linux-sparc
+%ifarch ppc ppc64 sparc sparc64
+%define target linux-%{_target_cpu}
%endif
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.98
-Release: 0.1%{?dist}
+Release: 0.2.20070319%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98/tachyon20070319.tar.gz
@@ -142,6 +139,9 @@
%{_datadir}/tachyon
%changelog
+* Sat Jul 14 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.2
+- add support for ppc64 and sparc64, simplify target setting
+
* Sat Jul 07 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.1
- update to 0.98 pre-release
More information about the scm-commits
mailing list