Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv25856
Added Files:
qhull6.3.patch
Log Message:
And here, too.
--- NEW FILE: qhull6.3.patch ---
diff -Nurd qhull-2012.1/Makefile qhull-2012.1.patched/Makefile
--- qhull-2012.1/Makefile 2012-01-30 22:23:13.000000000 -0500
+++ qhull-2012.1.patched/Makefile 2012-02-05 21:11:07.000000000 -0500
@@ -69,12 +69,12 @@
# You may build the qhull programs without using a library
# make qhullx
-DESTDIR = /usr/local
+DESTDIR = @INSTPREFIX@
BINDIR = $(DESTDIR)/bin
-DOCDIR = $(DESTDIR)/share/doc/packages/qhull
+DOCDIR = $(DESTDIR)/share/doc/qhull
INCDIR = $(DESTDIR)/include
LIBDIR = $(DESTDIR)/lib
-MANDIR = $(DESTDIR)/man/man1
+MANDIR = $(DESTDIR)/share/man/man1
# if you do not have enscript, try a2ps or just use lpr. The files are text.
PRINTMAN = enscript -2rl
@@ -84,21 +84,22 @@
#for Gnu's gcc compiler, -O2 for optimization, -g for debugging
CC = gcc
-CC_OPTS1 = -O2 -fPIC -ansi -Isrc/libqhull $(CC_WARNINGS)
+CC_OPTS1 = -O2 -fPIC -ansi -fno-common -Isrc/libqhull $(CC_WARNINGS)
CXX = g++
# libqhullcpp must be before libqhull
CXX_OPTS1 = -O2 -Dqh_QHpointer -Isrc/ -Isrc/libqhullcpp -Isrc/libqhull
$(CXX_WARNINGS)
# for shared library link
-CC_OPTS3 =
+CC_OPTS3 = -dynamiclib -install_name @FINKPREFIX@/lib/libqhull.6.3.0.dylib
+CC_OPTS4 = -dynamiclib -install_name @FINKPREFIX@/lib/libqhull6_p.6.3.0.dylib
# Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def,
qhull_p-exports.def, and qhull-warn.pri
# qhull.so -- static qh_qhT global data structure (qh_QHpointer=0)
# qhull6_p.so -- allocated qh_qhT global data structure (qh_QHpointer=1).
Required for libqhullcpp
# qhull7_t.so -- future version of Qhull with qh_qhT passed as an argument.
qhull_VERSION_MAJOR=6
-SO = so.6.3.0
+SO = 6.3.0.dylib
# On MinGW,
# make SO=dll
@@ -504,11 +505,11 @@
lib/libqhull.$(SO): $(LIBQHULLS_OBJS)
$(CC) -shared -o $@ $(CC_OPTS3) $^
- cd lib && ln -f -s libqhull.$(SO) libqhull.so
+ cd lib && ln -f -s libqhull.$(SO) libqhull.dylib
lib/libqhull$(qhull_VERSION_MAJOR)_p.$(SO): $(LIBQHULLSP_OBJS)
- $(CC) -shared -o $@ $(CC_OPTS3) $^
- cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR)_p.$(SO)
libqhull$(qhull_VERSION_MAJOR)_p.so
+ $(CC) -shared -o $@ $(CC_OPTS4) $^
+ cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR)_p.$(SO)
libqhull$(qhull_VERSION_MAJOR)_p.dylib
# don't use ../qconvex. Does not work on Red Hat Linux
bin/qconvex: src/qconvex/qconvex.o lib/libqhullstatic.a
@@ -537,7 +538,7 @@
@echo -e '\n\n== On MinGW/Cygwin, use "make cleanall; make SO=dll"'
@echo -e '== and copy lib/libqhull$(qhull_VERSION_MAJOR)_p.dll to bin'
@echo -e '== If user_eg fails to link, switch to -lqhullstatic_p\n'
- $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) $(CC_OPTS3) -Llib
-lqhull$(qhull_VERSION_MAJOR)_p -lm
+ $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) -Llib
-lqhull$(qhull_VERSION_MAJOR)_p -lm
# You may use -lqhullstatic instead of -lqhull
bin/user_eg2: src/user_eg2/user_eg2.o lib/libqhull.$(SO)
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
