rpms/tachyon/F-8 tachyon-rpm.patch,1.4,1.5 tachyon.spec,1.6,1.7
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Mon Dec 17 18:30:19 UTC 2007
Author: rathann
Update of /cvs/pkgs/rpms/tachyon/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2334
Modified Files:
tachyon-rpm.patch tachyon.spec
Log Message:
backport fixes from devel:
- more seamless variant handling
- use proper lam cflags and ldflags (as reported by pkgconfig)
- add support for Alpha
tachyon-rpm.patch:
Index: tachyon-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/F-8/tachyon-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tachyon-rpm.patch 14 Jul 2007 12:25:07 -0000 1.4
+++ tachyon-rpm.patch 17 Dec 2007 18:30:16 -0000 1.5
@@ -1,6 +1,7 @@
+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-07-14 14:22:32.000000000 +0200
-@@ -15,7 +15,7 @@
++++ tachyon/unix/Make-arch 2007-12-13 22:08:06.000000000 +0100
+@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
@@ -9,7 +10,7 @@
MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
default:
-@@ -983,7 +983,7 @@
+@@ -983,7 +983,7 @@ linux:
"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -18,7 +19,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-@@ -1007,7 +1007,7 @@
+@@ -1007,7 +1007,7 @@ linux-64:
"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
@@ -27,7 +28,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
-@@ -1029,10 +1029,10 @@
+@@ -1029,10 +1029,10 @@ linux-64-thr:
$(MAKE) all \
"ARCH = linux-64-thr" \
"CC = gcc" \
@@ -40,7 +41,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-@@ -1128,10 +1128,10 @@
+@@ -1128,10 +1128,10 @@ linux-thr:
$(MAKE) all \
"ARCH = linux-thr" \
"CC = gcc" \
@@ -53,7 +54,7 @@
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-@@ -1140,7 +1140,7 @@
+@@ -1140,7 +1140,7 @@ linux-thr-ogl:
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
@@ -62,33 +63,33 @@
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
-@@ -1174,37 +1174,61 @@
+@@ -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)/lib -ltachyon -lmpi $(MISCLIB) -lm"
-+ "LIBS = -L. -L$(LAMHOME) -ltachyon -lmpi $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
++ "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) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
++ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
@@ -99,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:
@@ -117,13 +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) -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -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:
@@ -134,13 +136,20 @@
+ "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:
-@@ -1242,6 +1266,234 @@
+ $(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"
@@ -173,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:
@@ -233,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:
@@ -293,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:
@@ -353,31 +362,95 @@
+ $(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:
$(MAKE) all \
+@@ -1259,13 +1511,61 @@ linux-alpha:
+ $(MAKE) all \
+ "ARCH = linux-alpha" \
+ "CC = gcc" \
+- "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
++ "CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
+
++# Linux Alpha using gcc and threads
++linux-alpha-thr:
++ $(MAKE) all \
++ "ARCH = linux-alpha-thr" \
++ "CC = gcc" \
++ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++
++# Linux Alpha using threads with OpenGL display
++linux-alpha-thr-ogl:
++ $(MAKE) all \
++ "ARCH = linux-alpha-thr-ogl" \
++ "CC = gcc" \
++ "CFLAGS = -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 Alpha using LAM MPI
++linux-alpha-lam:
++ $(MAKE) all \
++ "ARCH = linux-alpha-lam" \
++ "CC = mpicc" \
++ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "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 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
++ "AR = ar" \
++ "ARFLAGS = r" \
++ "STRIP = touch" \
++ "RANLIB = ranlib" \
++ "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-07-14 14:18:14.000000000 +0200
-@@ -57,7 +57,7 @@
++++ tachyon/unix/Make-config 2007-12-13 22:08:20.000000000 +0100
+@@ -57,7 +57,7 @@ X11LIB= -lX11
##########################################################################
# Standard MPICH installation location
@@ -386,7 +459,18 @@
# UMR CS Dept
#MPIDIR=/software/all/mpi
-@@ -108,14 +108,14 @@
+@@ -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
@@ -407,7 +491,7 @@
##########################################################################
-@@ -128,14 +128,14 @@
+@@ -128,14 +132,14 @@ JPEGLIB=
# http://www.libpng.org/
##########################################################################
# Uncomment the following lines to disable PNG support
@@ -428,8 +512,9 @@
##########################################################################
+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-07-14 14:18:14.000000000 +0200
++++ 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
@@ -441,7 +526,7 @@
#
-@@ -37,8 +37,8 @@
+@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr
#
# Linux OpenGL / GLX include and link specs
#
Index: tachyon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tachyon/F-8/tachyon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tachyon.spec 28 Aug 2007 23:41:33 -0000 1.6
+++ tachyon.spec 17 Dec 2007 18:30:16 -0000 1.7
@@ -4,14 +4,16 @@
%ifarch x86_64
%define target linux-64
%endif
-%ifarch ppc ppc64 sparc sparc64
+%ifarch ppc ppc64 sparc sparc64 alpha
%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.3.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,13 @@
%{_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
+
* Wed Aug 29 2007 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.98-0.3
- rebuild
- update license tag
More information about the fedora-extras-commits
mailing list