rpms/tachyon/devel tachyon-rpm.patch,1.5,1.6 tachyon.spec,1.7,1.8
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Thu Dec 13 21:13:46 UTC 2007
- Previous message (by thread): rpms/netdump-server/devel netdump-dumpdir-docs-scripts.patch, NONE, 1.1 netdump-dumpdir.patch, NONE, 1.1 netdump-init-typo.patch, NONE, 1.1 netdump-localport-option.patch, NONE, 1.1 netdump-makefile-servonly.patch, NONE, 1.1 netdump-retrans-on-log.patch, NONE, 1.1 netdump-server-Makefile.patch, NONE, 1.1 netdump-server-init.patch, NONE, 1.1 netdump-server.spec, NONE, 1.1 netdump-verbose-logging.patch, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): [pkgdb] zabbix: sharkcz has requested approveacls
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/pkgs/rpms/tachyon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19099
Modified Files:
tachyon-rpm.patch tachyon.spec
Log Message:
- more seamless variant handling
- use proper lam cflags and ldflags (as reported by pkgconfig)
tachyon-rpm.patch:
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/devel/tachyon-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tachyon-rpm.patch 3 Dec 2007 23:05:02 -0000 1.5
+++ tachyon-rpm.patch 13 Dec 2007 21:13:36 -0000 1.6
@@ -1,6 +1,6 @@
diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
--- tachyon/unix/Make-arch.r 2007-02-13 10:00:36.000000000 +0100
-+++ tachyon/unix/Make-arch 2007-12-04 00:01:04.000000000 +0100
++++ tachyon/unix/Make-arch 2007-12-13 22:08:06.000000000 +0100
@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -63,33 +63,33 @@
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
-@@ -1174,37 +1174,61 @@ linux-beowulf-mpi:
+@@ -1174,44 +1174,68 @@ linux-beowulf-mpi:
linux-lam:
$(MAKE) all \
"ARCH = linux-lam" \
- "CC = hcc" \
- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+ "CC = mpicc" \
-+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
+linux-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-lam-ogl" \
+ "CC = mpicc" \
-+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
@@ -100,14 +100,14 @@
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+ "ARCH = linux-64-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI, with OpenGL display
-linux-lam-64-ogl:
@@ -118,14 +118,14 @@
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "ARCH = linux-64-lam-ogl" \
+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
+linux-64-thr-ogl:
@@ -141,6 +141,14 @@
# Linux x86 using LAM MPI and threads
linux-lam-thr:
+ $(MAKE) all \
+ "ARCH = linux-lam-thr" \
+ "CC = hcc" \
+- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math $(LAMFLAGS) -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
@@ -1242,6 +1266,234 @@ linux-ppc:
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -174,24 +182,24 @@
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux PPC using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam-ogl" \
+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux PPC64 using gcc
+linux-ppc64:
@@ -234,24 +242,24 @@
+ $(MAKE) all \
+ "ARCH = linux-ppc64-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(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)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux SPARC using gcc
+linux-sparc:
@@ -294,24 +302,24 @@
+ $(MAKE) all \
+ "ARCH = linux-sparc-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -m32 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(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)" \
++ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux SPARC64 using gcc
+linux-sparc64:
@@ -354,24 +362,24 @@
+ $(MAKE) all \
+ "ARCH = linux-sparc64-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -m64 -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(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)" \
++ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
# Linux PPC using gcc
linux-ps2:
@@ -417,31 +425,31 @@
+ $(MAKE) all \
+ "ARCH = linux-alpha-lam" \
+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux Alpha using LAM MPI, with OpenGL display
+linux-alpha-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-alpha-lam-ogl" \
+ "CC = mpicc" \
-+ "CFLAGS = -Wall -O2 -I$(LAMHOME)/h -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -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"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
# Linux Alpha using Compaq's compilers
linux-alpha-ccc:
$(MAKE) all \
diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
--- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100
-+++ tachyon/unix/Make-config 2007-12-03 23:57:46.000000000 +0100
++++ tachyon/unix/Make-config 2007-12-13 22:08:20.000000000 +0100
@@ -57,7 +57,7 @@ X11LIB= -lX11
##########################################################################
@@ -451,7 +459,18 @@
# UMR CS Dept
#MPIDIR=/software/all/mpi
-@@ -108,14 +108,14 @@ MBOX=
+@@ -68,6 +68,10 @@ MPIDIR=/usr/local/mpi
+ # Cornell Theory Center SP-2 splogin.tc.cornell.edu
+ #MPIDIR=/usr/local/app/mpich
+
++# LAM
++LAMFLAGS=`pkg-config --cflags lam`
++LAMLIBS=`pkg-config --libs lam`
++
+
+ ##########################################################################
+ # Floating point configuration:
+@@ -108,14 +112,14 @@ MBOX=
# http://www.ijg.org/files/
##########################################################################
# Uncomment the following lines to disable JPEG support
@@ -472,7 +491,7 @@
##########################################################################
-@@ -128,14 +128,14 @@ JPEGLIB=
+@@ -128,14 +132,14 @@ JPEGLIB=
# http://www.libpng.org/
##########################################################################
# Uncomment the following lines to disable PNG support
@@ -495,7 +514,7 @@
##########################################################################
diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
--- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100
-+++ tachyon/unix/Make-opengl 2007-12-03 23:57:46.000000000 +0100
++++ tachyon/unix/Make-opengl 2007-12-13 21:54:04.000000000 +0100
@@ -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tachyon.spec 3 Dec 2007 23:05:02 -0000 1.7
+++ tachyon.spec 13 Dec 2007 21:13:36 -0000 1.8
@@ -8,10 +8,12 @@
%define target linux-%{_target_cpu}
%endif
+%define variants thr thr-ogl lam lam-ogl
+
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.98
-Release: 0.4.20070319%{?dist}
+Release: 0.5.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
@@ -93,17 +95,16 @@
%build
pushd unix
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-thr-ogl
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam
-%{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LAMHOME=%{_libdir}/lam %{target}-lam-ogl
+for variant in %{variants} ; do
+ %{__make} %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" %{target}-$variant
+done
popd
%install
%{__rm} -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/tachyon}
-for variant in -thr -thr-ogl -lam -lam-ogl ; do
- install -pm755 compile/%{target}$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon$variant
+for variant in %{variants} ; do
+ install -pm755 compile/%{target}-$variant/tachyon $RPM_BUILD_ROOT%{_bindir}/tachyon-$variant
done
rename -thr "" $RPM_BUILD_ROOT%{_bindir}/*
%{__rm} docs/tachyon/images.idx
@@ -139,6 +140,10 @@
%{_datadir}/tachyon
%changelog
+* Thu Dec 13 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.5
+- more seamless variant handling
+- use proper lam cflags and ldflags (as reported by pkgconfig)
+
* Tue Dec 04 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.4
- add support for Alpha
- Previous message (by thread): rpms/netdump-server/devel netdump-dumpdir-docs-scripts.patch, NONE, 1.1 netdump-dumpdir.patch, NONE, 1.1 netdump-init-typo.patch, NONE, 1.1 netdump-localport-option.patch, NONE, 1.1 netdump-makefile-servonly.patch, NONE, 1.1 netdump-retrans-on-log.patch, NONE, 1.1 netdump-server-Makefile.patch, NONE, 1.1 netdump-server-init.patch, NONE, 1.1 netdump-server.spec, NONE, 1.1 netdump-verbose-logging.patch, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): [pkgdb] zabbix: sharkcz has requested approveacls
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list