Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15988/10.7/stable/main/finkinfo/sci

Modified Files:
        gmsh2.5.0-shlibs.info 
Log Message:
Doesn't really _need_ to bury the lib and headers in a private
directory, so let's get rid of that before anything actually
builds against this. :-)
Accidentally put MACOS_DEPLOYMENT_TARGET=10.7 for the 10.4 tree
so fix that as well.

Index: gmsh2.5.0-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gmsh2.5.0-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gmsh2.5.0-shlibs.info       12 Oct 2011 15:45:53 -0000      1.1
+++ gmsh2.5.0-shlibs.info       14 Oct 2011 01:56:07 -0000      1.2
@@ -1,6 +1,6 @@
 Package: gmsh2.5.0-shlibs
 Version: 2.5.0
-Revision: 2
+Revision: 3
 Depends: <<
        fltk13-aqua-shlibs,
        gmp5-shlibs,
@@ -34,7 +34,7 @@
 #!/bin/sh -ev
 mkdir build
 cd build
-cmake  -DCMAKE_PREFIX_PATH=%p -DCMAKE_INSTALL_PREFIX=%i/opt/gmsh-%v 
-DCMAKE_OSX_ARCHITECTURES=%m -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 ..
+cmake  -DCMAKE_PREFIX_PATH=%p -DCMAKE_INSTALL_PREFIX=%i 
-DCMAKE_OSX_ARCHITECTURES=%m ..
 make verbose=1 shared
 <<
 
@@ -45,17 +45,17 @@
 cd %d
 # clear out stuff that gets installed in the 'gmsh' package or that we 
 # don't want 
-rm -rf *.txt demos gmsh.1 tutorial 
+rm -rf *.txt demos gmsh.1 tutorial MacOS
 cd %i
-rm -rf opt/MacOS opt/gmsh-%v/*.icns
+rm -rf *.icns
 # fix library up
-cd opt/gmsh-2.5.0/lib
+cd lib
 mv libGmsh.dylib libGmsh.%v.dylib
 ln -s libGmsh.%v.dylib libGmsh.dylib
-install_name_tool -id %p/opt/gmsh-2.5.0/lib/libGmsh.%v.dylib libGmsh.%v.dylib
+install_name_tool -id %p/lib/libGmsh.%v.dylib libGmsh.%v.dylib
 <<
 
-Shlibs: %p/opt/gmsh-%v/lib/libGmsh.%v.dylib 0.0.0 %n (>=2.5.0-2)
+Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>=2.5.0-2)
 
 DocFiles: doc/*.txt doc/gmsh.html
 Homepage: http://www.geuz.org/gmsh
@@ -85,17 +85,20 @@
        Oddly enough, clang complains about a void function with a return
        value :-) so we patch that.
 
-       Install headers and libs in a private directory to facilitate 
coexistence
-       of the libs on upgrade, at the penalty of a new install_name each
-       time around.
+       Create a versioned dylib so that the -shlibs can coexist--given the
+       lack of compatibility_version, it's hard to say whether different
+       %v will be ABI-comptible without inspection.
+       
+       As of Revision 3:  don't install in a private location anymore, 
+       since that's a bit excessive for a new package with one library.
 <<
 
 Splitoff: <<
        Package: gmsh2.5.0-dev
        Depends: %N
        Files: <<
-               opt/gmsh-2.5.0/include
-               opt/gmsh-2.5.0/lib/libGmsh.dylib
+               include
+               lib/libGmsh.dylib
        <<
 BuildDependsOnly: true
 DocFiles: doc/*.txt doc/gmsh.html


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to