rpms/tachyon/devel tachyon-rpm.patch,1.1,1.2 tachyon.spec,1.1,1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Sun Dec 17 00:46:29 UTC 2006
- Previous message: rpms/perl-SVN-Mirror/FC-5 .cvsignore, 1.2, 1.3 perl-SVN-Mirror.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/emelfm2/devel .cvsignore, 1.9, 1.10 emelfm2-makefile.config.patch, 1.2, 1.3 emelfm2.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/extras/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30464
Modified Files:
tachyon-rpm.patch tachyon.spec
Log Message:
- add SPARC support
tachyon-rpm.patch:
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon-rpm.patch 30 Nov 2006 11:52:52 -0000 1.1
+++ tachyon-rpm.patch 17 Dec 2006 00:45:59 -0000 1.2
@@ -1,5 +1,5 @@
--- tachyon/unix/Make-arch.r 2005-03-18 16:28:05.000000000 +0100
-+++ tachyon/unix/Make-arch 2006-11-29 19:54:45.000000000 +0100
++++ tachyon/unix/Make-arch 2006-12-17 00:42:01.000000000 +0100
@@ -15,7 +15,7 @@
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -74,7 +74,8 @@
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
@@ -86,8 +87,7 @@
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
@@ -122,7 +122,8 @@
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
@@ -134,13 +135,12 @@
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
# Linux x86 using LAM MPI and threads
linux-lam-thr:
-@@ -1149,6 +1173,54 @@
+@@ -1149,6 +1173,114 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -168,7 +168,7 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
-+# Linux AMD64/EM64T using LAM MPI
++# Linux PPC using LAM MPI
+linux-ppc-lam:
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam" \
@@ -180,7 +180,7 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
+
-+# Linux AMD64/EM64T using LAM MPI, with OpenGL display
++# Linux PPC using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam-ogl" \
@@ -192,11 +192,71 @@
+ "RANLIB = ranlib" \
+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
++# Linux SPARC using gcc
++linux-sparc:
++ $(MAKE) all \
++ "ARCH = linux-sparc" \
++ "CC = gcc" \
++ "CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = strip" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
++
++# Linux SPARC using gcc and threads
++linux-ppc-thr:
++ $(MAKE) all \
++ "ARCH = linux-sparc-thr" \
++ "CC = gcc" \
++ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux SPARC using threads with OpenGL display
++linux-ppc-thr-ogl:
++ $(MAKE) all \
++ "ARCH = linux-sparc-thr-ogl" \
++ "CC = gcc" \
++ "CFLAGS = -m32 -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 SPARC using LAM MPI
++linux-sparc-lam:
++ $(MAKE) all \
++ "ARCH = linux-sparc-lam" \
++ "CC = mpicc" \
++ "CFLAGS = -m32 -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 SPARC using LAM MPI, with OpenGL display
++linux-sparc-lam-ogl:
++ $(MAKE) all \
++ "ARCH = linux-sparc-lam-ogl" \
++ "CC = mpicc" \
++ "CFLAGS = -m32 -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-11-29 19:51:01.000000000 +0100
++++ tachyon/unix/Make-config 2006-12-17 00:37:45.000000000 +0100
@@ -57,7 +57,7 @@
##########################################################################
@@ -249,7 +309,7 @@
##########################################################################
--- tachyon/unix/Make-opengl.r 2004-02-04 07:36:06.000000000 +0100
-+++ tachyon/unix/Make-opengl 2006-11-29 19:51:01.000000000 +0100
++++ tachyon/unix/Make-opengl 2006-12-17 00:37:45.000000000 +0100
@@ -9,8 +9,8 @@
#
# Generic Mesa OpenGL / GLX include and link specs, for most platforms
Index: tachyon.spec
===================================================================
RCS file: /cvs/extras/rpms/tachyon/devel/tachyon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tachyon.spec 30 Nov 2006 11:52:52 -0000 1.1
+++ tachyon.spec 17 Dec 2006 00:45:59 -0000 1.2
@@ -7,11 +7,14 @@
%ifarch ppc
%define target linux-ppc
%endif
+%ifarch sparc
+%define target linux-sparc
+%endif
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.97
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
Source: http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.97/tachyon-0.97.tar.gz
@@ -139,6 +142,9 @@
%{_datadir}/tachyon
%changelog
+* Sun Dec 17 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-3
+- add SPARC support
+
* Wed Nov 29 2006 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.97-2
- use only kosher CFLAGS
- fix target setting
- Previous message: rpms/perl-SVN-Mirror/FC-5 .cvsignore, 1.2, 1.3 perl-SVN-Mirror.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/emelfm2/devel .cvsignore, 1.9, 1.10 emelfm2-makefile.config.patch, 1.2, 1.3 emelfm2.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list