Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv19677
Modified Files:
xraylib-pm.info xraylib-python.info xraylib.info
Log Message:
Fix building and linking
Index: xraylib-pm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/xraylib-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xraylib-pm.info 5 Oct 2011 23:26:57 -0000 1.2
+++ xraylib-pm.info 6 Oct 2011 16:28:12 -0000 1.3
@@ -33,8 +33,8 @@
<<
ConfigureParams: <<
---disable-idl --disable-python --disable-java \
---disable-fortran2003 --disable-static --disable-shared
+--prefix=%p --disable-idl --disable-python --disable-java \
+--disable-fortran2003 --disable-static
<<
CompileScript: <<
@@ -48,15 +48,15 @@
InstallScript: <<
make install DESTDIR=%d
-rm -rf %d/usr
+rm -rf %i/include
+rm %i/lib/libxrl.{la,*dylib}
+rm -rf %i/lib/pkgconfig
+rm -rf %i/share/xraylib
<<
DescPackaging: <<
Appears to want to build the whole works, so we do that and then remove stuff
unrelated to the Perl bindings
-
-I'm not sure why the Perl binding unsets stuff so that it uses llvm-gcc
-and /usr/local...
<<
DocFiles: AUTHORS BUGS Changelog README TODO
Index: xraylib-python.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/xraylib-python.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xraylib-python.info 5 Oct 2011 22:06:56 -0000 1.1
+++ xraylib-python.info 6 Oct 2011 16:28:12 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: xraylib-python%type_pkg[python]
Version: 2.15.0
-Revision: 1
+Revision: 2
Type: python (2.6 2.7 3.1)
Description: X-ray fluorescence library (Python interface)
@@ -41,7 +41,7 @@
ConfigureParams: <<
--disable-idl --disable-perl --disable-java \
---disable-fortran2003 --disable-static --disable-shared
+--disable-fortran2003 --disable-static
<<
CompileScript: <<
@@ -58,7 +58,7 @@
make install DESTDIR=%d
rm -rf %i/include
mv %i/bin/xraylib %i/bin/xraylib-%type_raw[python]
-rm %i/lib/libxrl.la
+rm %i/lib/libxrl.{la,*dylib}
rm -rf %i/lib/pkgconfig
rm -rf %i/share/xraylib
<<
Index: xraylib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/xraylib.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xraylib.info 5 Oct 2011 22:06:56 -0000 1.1
+++ xraylib.info 6 Oct 2011 16:28:12 -0000 1.2
@@ -1,6 +1,6 @@
Package: xraylib
Version: 2.15.0
-Revision: 1
+Revision: 2
Description: X-ray fluorescence library (build-time)
DescDetail: <<
@@ -52,13 +52,15 @@
Enable Java bindings because Java is included with the OS.
Use install_name_tool on the java lib so that it has an absolute install_name.
+
+The text files are in the -shlibs package because they are used at runtime.
<<
DocFiles: AUTHORS BUGS Changelog README TODO
SplitOff: <<
Package: %N-shlibs
- Files: lib/libxrl.3.dylib
+ Files: lib/libxrl.3.dylib share/%N/*.txt
Shlibs: %p/lib/libxrl.3.dylib 6.0.0 %n (>=2.13.1-1)
DocFiles: AUTHORS BUGS Changelog README TODO
Description: X-ray fluorescence library (shared lib)
------------------------------------------------------------------------------
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-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
