[tachyon] install missing tachyon_dep.h header link shared library against libjpeg to avoid unresolved symbols
Dominik Mierzejewski
rathann at fedoraproject.org
Sat Jul 23 18:30:38 UTC 2011
commit d787aff37edecf96aadce15b14afba79773543e1
Author: Dominik Mierzejewski <dominik at greysector.net>
Date: Sat Jul 23 20:29:49 2011 +0200
install missing tachyon_dep.h header
link shared library against libjpeg to avoid unresolved symbols
tachyon-rpm.patch | 34 ++++++++++++++++------------------
tachyon-shared.patch | 4 ++--
tachyon.spec | 8 ++++++--
3 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/tachyon-rpm.patch b/tachyon-rpm.patch
index d145c0c..befed75 100644
--- a/tachyon-rpm.patch
+++ b/tachyon-rpm.patch
@@ -1,6 +1,6 @@
diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
--- tachyon/unix/Make-arch.r 2011-02-18 19:19:55.000000000 +0100
-+++ tachyon/unix/Make-arch 2011-04-10 03:48:30.000000000 +0200
++++ tachyon/unix/Make-arch 2011-07-23 20:16:02.000000000 +0200
@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
@@ -36,27 +36,25 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-@@ -1214,7 +1214,18 @@ linux-thr-ogl:
+@@ -1214,7 +1214,7 @@ linux-thr-ogl:
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
- "CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
-+ "AR = ar" \
-+ "ARFLAGS = r" \
-+ "STRIP = touch" \
-+ "LIBS = -L. -ltachyon $(MISCLIB) $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
-+
-+# Linux AMD64/EM64T using gcc, threads, and OpenGL
-+linux-64-thr-ogl:
-+ $(MAKE) all \
-+ "ARCH = linux-64-thr-ogl" \
-+ "CC = cc" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+@@ -1225,7 +1225,7 @@ linux-64-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-64-thr-ogl" \
+ "CC = cc" \
+- "CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -DLP64 -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
-@@ -1284,25 +1295,37 @@ linux-beowulf-mpi:
+@@ -1284,25 +1284,37 @@ linux-beowulf-mpi:
linux-lam:
$(MAKE) all \
"ARCH = linux-lam" \
@@ -68,7 +66,8 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
-+ "RANLIB = ranlib" \
+ "RANLIB = ranlib" \
+- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
@@ -80,8 +79,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
- "RANLIB = ranlib" \
-- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
++ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
@@ -104,7 +102,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
linux-mpi:
$(MAKE) all \
-@@ -1340,16 +1363,16 @@ linux-mpi-64:
+@@ -1340,16 +1352,16 @@ linux-mpi-64:
# Linux AMD64/EM64T using LAM MPI, with OpenGL display
@@ -129,7 +127,7 @@ diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
linux-lam-thr:
diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
--- tachyon/unix/Make-config.r 2011-01-20 06:35:01.000000000 +0100
-+++ tachyon/unix/Make-config 2011-04-10 03:01:30.000000000 +0200
++++ tachyon/unix/Make-config 2011-07-23 20:09:17.000000000 +0200
@@ -57,7 +57,7 @@ X11LIB= -lX11
##########################################################################
diff --git a/tachyon-shared.patch b/tachyon-shared.patch
index 9af3741..a5d328d 100644
--- a/tachyon-shared.patch
+++ b/tachyon-shared.patch
@@ -1,6 +1,6 @@
diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
--- tachyon/unix/Makefile.shared 2011-02-07 16:14:38.000000000 +0100
-+++ tachyon/unix/Makefile 2011-04-10 03:59:27.000000000 +0200
++++ tachyon/unix/Makefile 2011-07-23 20:23:51.000000000 +0200
@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
#
# Name of raytracing library file to create
@@ -20,7 +20,7 @@ diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
- rm -f ${RAYLIB}
- ${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS}
- ${RANLIB} ${RAYLIB}
-+ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS}
++ ${CC} -shared -Wl,-soname,lib${DIRNAME}.so -o ${RAYLIBDIR}/lib${DIRNAME}.so ${CFLAGS} -fPIC -lpng -lm -lpthread ${RAYOBJS} ${JPEGLIB}
+ ln -s lib${DIRNAME}.so $@
${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS}
diff --git a/tachyon.spec b/tachyon.spec
index 715d330..a0263fc 100644
--- a/tachyon.spec
+++ b/tachyon.spec
@@ -10,7 +10,7 @@
Summary: Parallel / Multiprocessor Ray Tracing System
Name: tachyon
Version: 0.99
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
URL: http://jedi.ks.uiuc.edu/~johns/raytracer/
Group: Applications/Engineering
Source0: http://jedi.ks.uiuc.edu/~johns/raytracer/files/%{version}%{beta}/%{name}-%{version}%{beta}.tar.gz
@@ -109,7 +109,7 @@ mkdir docs/html
install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
echo ".so tachyon.1" > $RPM_BUILD_ROOT%{_mandir}/man1/tachyon-ogl.1
%{__cp} -a compile/%{target}-thr/libtachyon*.so $RPM_BUILD_ROOT%{_libdir}/
-install -pm644 src/{hash,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/
+install -pm644 src/{hash,tachyon{,_dep},util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -140,6 +140,10 @@ install -pm644 src/{hash,tachyon,util}.h $RPM_BUILD_ROOT%{_includedir}/tachyon/
%{_datadir}/tachyon
%changelog
+* Sat Jul 23 2011 Dominik Mierzejewski <rpm at greysector.net> 0.99-0.2.b2
+- install missing tachyon_dep.h header
+- link shared library against libjpeg to avoid unresolved symbols
+
* Sun Apr 10 2011 Dominik 'Rathann' Mierzejewski <rpm at greysector.net> 0.99-0.1.b2
- updated to 0.99b2
- rebased patch
More information about the scm-commits
mailing list