diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-01-26 05:16:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-26 05:16:45 +0000 |
| commit | 8df222ee02697d4755021c23b767ee8dd82bafba (patch) | |
| tree | e829e508316172b0f81ea2b76219ff8963a87850 /dev-db | |
| parent | Fix missing prototypes for *times functions. (diff) | |
| download | gentoo-2-8df222ee02697d4755021c23b767ee8dd82bafba.tar.gz gentoo-2-8df222ee02697d4755021c23b767ee8dd82bafba.tar.bz2 gentoo-2-8df222ee02697d4755021c23b767ee8dd82bafba.zip | |
Fixup tcl lib install by using libtool rather than manual copy.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/sqlite/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch | 27 | ||||
| -rw-r--r-- | dev-db/sqlite/sqlite-3.6.10.ebuild | 3 |
3 files changed, 35 insertions, 3 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog index 261d565a3c2d..5218e342d4ee 100644 --- a/dev-db/sqlite/ChangeLog +++ b/dev-db/sqlite/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/sqlite -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.212 2009/01/23 11:34:26 armin76 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.213 2009/01/26 05:16:45 vapier Exp $ + + 26 Jan 2009; Mike Frysinger <vapier@gentoo.org> + +files/sqlite-3.6.10-tcl-install.patch, sqlite-3.6.10.ebuild: + Fixup tcl lib install by using libtool rather than manual copy. 23 Jan 2009; Raúl Porcel <armin76@gentoo.org> sqlite-3.6.6.2.ebuild: arm/ia64/s390/sh stable wrt #254684 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 new file mode 100644 index 000000000000..c7f7b7bd80f7 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.6.10-tcl-install.patch @@ -0,0 +1,27 @@ +--- Makefile.in ++++ Makefile.in +@@ -457,7 +457,7 @@ + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o $@ tclsqlite.lo \ + libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ +- -rpath "$(libdir)/sqlite" \ ++ -rpath "$(libdir)/sqlite3" \ + -module -avoid-version + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +@@ -765,8 +765,13 @@ + $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) + $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir) + +-tcl_install: libtclsqlite3.la +- $(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 ++ $(INSTALL) -d $(DESTDIR)$(libdir)/sqlite3 ++ $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(libdir)/sqlite3 ++ rm -f $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.a $(DESTDIR)$(libdir)/sqlite3/libtclsqlite3.la ++ $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(libdir)/sqlite3 + + clean: + rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la diff --git a/dev-db/sqlite/sqlite-3.6.10.ebuild b/dev-db/sqlite/sqlite-3.6.10.ebuild index 0497f37f67c5..d56c0d0d34f6 100644 --- a/dev-db/sqlite/sqlite-3.6.10.ebuild +++ b/dev-db/sqlite/sqlite-3.6.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.10.ebuild,v 1.1 2009/01/18 17:44:57 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.10.ebuild,v 1.2 2009/01/26 05:16:45 vapier Exp $ EAPI="1" @@ -42,6 +42,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/sandbox-fix2.patch + epatch "${FILESDIR}"/${P}-tcl-install.patch elibtoolize epunt_cxx |