Update of /cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv25807/common/finkinfo/sci
Modified Files:
qhull6.info qhull6.patch
Log Message:
Fix for building with g++-4.0 (thanks, fangism)
Fix upstream weirdness with using options for dynamic lib building in
a build test as well (also thanks to fangism for reporting this--error
is silent on 10.5+)
Clean up InstallScript.
Index: qhull6.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci/qhull6.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qhull6.patch 23 Aug 2011 23:19:31 -0000 1.2
+++ qhull6.patch 25 Aug 2011 16:51:09 -0000 1.3
@@ -1,6 +1,6 @@
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
++++ qhull-2011.1.patched/Makefile 2011-08-25 12:07:26.000000000 -0400
@@ -64,12 +64,12 @@
# You may build the qhull programs without using a library
# make qhullx
@@ -46,3 +46,12 @@
# don't use ../qconvex. Does not work on Red Hat Linux
bin/qconvex: src/qconvex/qconvex.o lib/libqhullstatic.a
+@@ -457,7 +457,7 @@
+ bin/user_eg: src/user_eg/user_eg.c lib/libqhull$(qhull_VERSION_MAJOR).$(SO)
+ echo -e '\n== If user_eg fails to link, switch to -lqhullstatic_p.\n==
On MinGW/Cygwin, use "make SO=dll"'
+ echo -e "\\n== and copy lib/libqhull$(qhull_VERSION_MAJOR).$(SO) to
bin\\n\\n"
+- $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) $(CC_OPTS3) -Llib
-lqhull$(qhull_VERSION_MAJOR) -lm
++ $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) -Llib
-lqhull$(qhull_VERSION_MAJOR) -lm
+
+ bin/user_eg2: src/user_eg2/user_eg2.o lib/libqhullstatic.a
+ $(CC) -o $@ $< $(CC_OPTS2) -Llib -lqhullstatic -lm
Index: qhull6.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci/qhull6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qhull6.info 23 Aug 2011 23:19:31 -0000 1.2
+++ qhull6.info 25 Aug 2011 16:51:09 -0000 1.3
@@ -21,12 +21,6 @@
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
@@ -38,10 +32,12 @@
Replaces: qhull
PatchFile: %n.patch
-PatchFile-MD5: abf949ee16a68f9720198798b07725b0
+PatchFile-MD5: 8498f1f42b4aa2c2a47fd70353acb293
PatchScript: <<
sed -e 's,@INSTPREFIX@,%i,' -e 's,@FINKPREFIX@,%p,' %{PatchFile} | patch -p1
-sed -ie 's|-Wno-sign-conversion||' Makefile
+#sed -ie 's|-Wno-sign-conversion||' 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
@@ -54,11 +50,11 @@
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
+#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
------------------------------------------------------------------------------
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
