Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv1303
Added Files:
qhull6.info qhull6.patch
Log Message:
slightly patched from akh's master copy in exp., on darwin8, final link fails:
ld: lib/libqhull6.dylib can't be linked because it has the same install_name
(/sw/lib/libqhull6.2.0.dylib) as the output
--- NEW FILE: qhull6.patch ---
diff -Nurd qhull-2011.1/Makefile qhull-2011.1.patched/Makefile
--- qhull-2011.1/Makefile 2011-05-14 14:00:48.000000000 -0400
+++ qhull-2011.1.patched/Makefile 2011-08-22 17:48:30.000000000 -0400
@@ -64,12 +64,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
@@ -80,16 +80,16 @@
#for Gnu's gcc compiler, -O2 for optimization, -g for debugging
# -fno-strict-aliasing not needed for gcc 4.4+ (segfault in qset.c)
CC = gcc
-CC_OPTS1 = -O2 -fPIC -ansi -fno-strict-aliasing -Isrc/libqhull $(CC_WARNINGS)
+CC_OPTS1 = -O2 -fPIC -ansi -fno-common -fno-strict-aliasing -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/libqhull6.2.0.dylib
# Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, and
qhull-warn.pri
qhull_VERSION_MAJOR=6
-SO = so.6.2.0
+SO = 2.0.dylib
# On MinGW,
# make SO=dll
@@ -432,7 +432,7 @@
lib/libqhull$(qhull_VERSION_MAJOR).$(SO): $(LIBQHULLSP_OBJS)
$(CC) -shared -o $@ $(CC_OPTS3) $^
- cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR).$(SO)
libqhull$(qhull_VERSION_MAJOR).so
+ cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR).$(SO)
libqhull$(qhull_VERSION_MAJOR).dylib
# don't use ../qconvex. Does not work on Red Hat Linux
bin/qconvex: src/qconvex/qconvex.o lib/libqhullstatic.a
--- NEW FILE: qhull6.info ---
Package: qhull6
Version: 2011.1
Revision: 1
Description: Calculate convex hulls and related structures
License: BSD
Maintainer: Stefan Langerman <[email protected]>
DescDetail: <<
Qhull computes convex hulls, Delaunay triangulations, halfspace
intersections about a point, Voronoi diagrams, furthest-site
Delaunay triangulations, and furthest-site Voronoi diagrams.
It runs in 2-d, 3-d, 4-d, and higher dimensions. It implements
the Quickhull algorithm for computing the convex hull. Qhull
handles roundoff errors from floating point arithmetic. It
computes volumes, surface areas, and approximations to the
convex hull.
<<
DescUsage: <<
This package contains the executables, manpages, and other documentation.
<<
DescPort: <<
Upstream doesn't appear to grok OS X, so we handcraft the dylib's
install_name.
<<
DescPackaging: <<
For some reason I was getting a lib%N6.dylib -> lib%N6.2.0.dylib
hardlink
instead of symlink, so clean that up manually.
Put in %p/include/%n -> %p/include/lib%n compatibility symlink for
packages
which were using the previous static-only version of the package.
<<
Source: http://www.qhull.org/download/qhull-%v-src.tgz
Source-MD5: a65061cf2a6e6581182f4df0f3667a8e
SourceDirectory: qhull-%v
BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r )
Conflicts: qhull
Replaces: qhull
PatchFile: %n.patch
PatchFile-MD5: abf949ee16a68f9720198798b07725b0
PatchScript: <<
#!/bin/sh -ev
sed -e 's,@INSTPREFIX@,%i,' -e 's,@FINKPREFIX@,%p,' %{PatchFile} | patch -p1
sed -i.orig -e 's|-Wno-sign-conversion||' \
-e '/^qtest:/s|$| bin/rbox bin/qhull|' Makefile
# fangism: g++-4.0 needs qualifier on friend member class, even if
forward-declared
sed -i.orig -e
'/friend.*class.*const_iterator;/s|const_iterator|QhullPointSet::&|;'
src/libqhullcpp/QhullPointSet.h
<<
GCC: 4.0
CompileScript: make
InfoTest: <<
TestScript: make test || exit 2
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 install
pushd %i/lib
rm %i/lib/lib%N.dylib
ln -s lib%N.2.0.dylib lib%N.dylib
popd
cd %i/include
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
Homepage: http://www.qhull.org/
SplitOff: <<
Package: %N-shlibs
Files: lib/lib%N.2.0.dylib
Shlibs: %p/lib/libqhull6.2.0.dylib 0.0.0 %n (>= 2011.1-1)
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt
DescUsage: <<
This package contains the shared library.
<<
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
Conflicts: qhull
Replaces: qhull
Files: <<
include
lib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt
DescUsage: <<
This package contains the header files, static libraries, and the
unversioned dylib.
<<
<<
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
