Projects
New Ticket     Wiki     Browse Source     Timeline     Roadmap     Bug Reports     Search

root/trunk/base/src/sqlite-3.1.3.diff

Revision 43216, 2.3 KB (checked in by blb@…, 5 weeks ago)

src/sqlite-3.1.3.diff - properly load the sqlite3 package (only installed
on 10.3)

  • src/sqlite-3.1.3

    diff -ru src/sqlite-3.1.3/Makefile.in src/sqlite-3.1.3.mine/Makefile.in
    old new  
    605605        mkdir -p doc 
    606606        mv $(DOC) doc 
    607607 
    608 install:        sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install} 
     608dont_install:   sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install} 
    609609        $(INSTALL) -d $(DESTDIR)$(libdir) 
    610610        $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir) 
    611611        $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin 
     
    615615        $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;  
    616616        $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig;  
    617617 
    618 tcl_install:    libtclsqlite3.la 
     618install:        libtclsqlite3.la 
    619619        tclsh $(TOP)/tclinstaller.tcl $(VERSION) 
    620620 
    621621clean:   
  • src/sqlite-3.1.3

    diff -ru src/sqlite-3.1.3/configure src/sqlite-3.1.3.mine/configure
    old new  
    2034320343######### 
    2034420344# Generate the output files. 
    2034520345# 
    20346                     ac_config_files="$ac_config_files Makefile sqlite3.pc" 
     20346                    ac_config_files="$ac_config_files Makefile sqlite3.pc tclinstaller.tcl" 
    2034720347cat >confcache <<\_ACEOF 
    2034820348# This file is a shell script that caches the results of configure 
    2034920349# tests run on this system so they can be shared between configure 
  • tclinstaller.tcl

    diff -ru src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3.mine/tclinstaller.tcl
    old new  
    77set VERSION [lindex $argv 0] 
    88set LIBFILE .libs/libtclsqlite3[info sharedlibextension] 
    99if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" } 
    10 set LIBDIR $env(DESTDIR)[lindex $auto_path 0] 
     10set LIBDIR $env(DESTDIR)@prefix@/share/macports/Tcl 
    1111set LIBNAME [file tail $LIBFILE] 
    1212set LIB $LIBDIR/sqlite3/$LIBNAME 
    1313 
    1414file delete -force $LIBDIR/sqlite3 
    1515file mkdir $LIBDIR/sqlite3 
    1616set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w] 
    17 puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]" 
     17puts $fd "package ifneeded sqlite3 $VERSION \[list load \[file join \$dir libtclsqlite3.dylib\]\]" 
    1818close $fd 
    1919 
    2020# We cannot use [file copy] because that will just make a copy of 
Note: See TracBrowser for help on using the browser.