Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18938

Modified Files:
        sqlite3-x86_64.info 
Log Message:
fix tcl build and correct shared lib build

Index: sqlite3-x86_64.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/sqlite3-x86_64.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sqlite3-x86_64.info 15 Apr 2009 03:35:02 -0000      1.1
+++ sqlite3-x86_64.info 16 Apr 2009 01:13:41 -0000      1.2
@@ -30,7 +30,7 @@
        %{default_script}
        head -n 10 src/sqlite.h.in > LICENSE
 <<
-ConfigureParams: --disable-tcl --enable-threadsafe --enable-load-extension
+ConfigureParams: --with-tcl=%p/lib --enable-threadsafe --enable-load-extension
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I%p/include/readline
 SetCFLAGS: -Os -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -45,26 +45,33 @@
 
 CompileScript: <<
     #!/bin/sh -ev
-    config_TARGET_READLINE_LIBS='-L%p/lib -lreadline -lncurses' \
+    perl -pi -e "s,tclsh8.4,tclsh8.5,," ./configure
+    TCLLIBDIR=%p/lib/tcl8.5/sqlite3 config_TARGET_READLINE_LIBS='-L%p/lib 
-lreadline -lncurses' \
         ./configure %c
     make
 <<
 
-InfoTest: <<
-    TestScript: make test || exit 2
-<<
+# Tests can't be run as root without crashing packaging
+#InfoTest: <<
+#    TestScript: make test || exit 2
+#<<
 
 InstallScript: <<
     #!/bin/sh -ev
-    make install DESTDIR=%d
+    TCLLIBDIR=%p/lib/tcl8.5/sqlite3 make install DESTDIR=%d
+    make sqlite3_analyzer
+    cp -r sqlite3_analyzer %i/bin
+    mv "%i/lib/tcl8.5/sqlite3/libtclsqlite3.dylib" 
"%i/lib/tcl8.5/sqlite3/libtclsqlite3.0.dylib"    
+    ln -s "libtclsqlite3.0.dylib" "%i/lib/tcl8.5/sqlite3/libtclsqlite3.dylib"
+    install_name_tool -id "%p/lib/tcl8.5/sqlite3/libtclsqlite3.dylib" 
"%i/lib/tcl8.5/sqlite3/libtclsqlite3.0.dylib"
 <<
 
 SplitOff: << 
     Package: %N-shlibs
     Description: Embedded SQL database (shared libraries)
     DocFiles: VERSION LICENSE
+    Files: lib/libsqlite3.*.dylib
     Shlibs: %p/lib/libsqlite3.0.dylib 9.0.0 %n (>= 3.0.8-1)
-    Files: lib/libsqlite3.0.dylib
 <<
 
 SplitOff2: << 
@@ -86,3 +93,25 @@
         lib/pkgconfig
     <<
 <<
+SplitOff3: <<
+    Package: %N-tcl
+    Description: Embedded SQL database (Tcl/Tk bindings)
+    Depends: %N-shlibs (= %v-%r), tcltk (>= 8.5.6)
+    Conflicts: %N-tcltk
+    Replaces: %N-tcltk
+    DocFiles: VERSION LICENSE
+    Files: <<
+    lib/tcl8.5/sqlite3/libtclsqlite3.dylib
+    lib/tcl8.5/sqlite3/libtclsqlite3.0.dylib
+    <<
+    Shlibs: <<
+       %p/lib/tcl8.5/sqlite3/libtclsqlite3.dylib 0.0.0 %n (>= 3.0.8-1)
+     <<
+<<
+SplitOff4: <<
+    Package: %N-analyzer
+    Description: SQLite3 analyzer program
+    Depends: %N-tcl
+    DocFiles: VERSION LICENSE
+    Files: %p/bin/sqlite3_analyzer
+<<


------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to