summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-18 17:07:21 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-18 17:07:21 +0000
commit752e398e6dbd8e80090ef35e32dd0705d054998b (patch)
treec520b9aacec84f9cb8c6faf1bb34a32f214a4bc5 /dev-db/sqlite/files
parentarm/ia64/sh stable wrt #254447 (diff)
downloadgentoo-2-752e398e6dbd8e80090ef35e32dd0705d054998b.tar.gz
gentoo-2-752e398e6dbd8e80090ef35e32dd0705d054998b.tar.bz2
gentoo-2-752e398e6dbd8e80090ef35e32dd0705d054998b.zip
Fix installing when sqlite isnt installed already.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/sqlite/files')
-rw-r--r--dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch17
1 files changed, 15 insertions, 2 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
index c7f7b7bd80f7..b390c2fd36d7 100644
--- a/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
+++ b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch
@@ -9,7 +9,20 @@
-module -avoid-version
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
-@@ -765,8 +765,13 @@
+@@ -754,9 +754,11 @@
+ $(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL)
+
+
+-install: sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
++lib_install: libsqlite3.la
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
++
++install: sqlite3$(BEXE) lib_install sqlite3.h ${HAVE_TCL:1=tcl_install}
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
+ $(INSTALL) -d $(DESTDIR)$(includedir)
+@@ -765,8 +767,13 @@
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
@@ -17,7 +30,7 @@
- $(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
+pkgIndex.tcl:
+ echo 'package ifneeded sqlite3 $(RELEASE) [list load $(libdir)/sqlite3/libtclsqlite3.so sqlite3]' > $@
-+tcl_install: libtclsqlite3.la pkgIndex.tcl
++tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
+ $(INSTALL) -d $(DESTDIR)$(libdir)/sqlite3
+ $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(libdir)/sqlite3
+ rm -f $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.a $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.la