summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-12-15 20:06:31 +0000
committerJustin Lecher <jlec@gentoo.org>2010-12-15 20:06:31 +0000
commit8d3a3b7f6978b2e3728454d1c288f437fa6a3c8c (patch)
tree54c9a1b367095ae605e03e01f84c28cde833161d /dev-tcltk/tcl-sql
parentVersion bump as requested by bug #339034. Thanks to Zoltan Karcagi. (diff)
downloadgentoo-2-8d3a3b7f6978b2e3728454d1c288f437fa6a3c8c.tar.gz
gentoo-2-8d3a3b7f6978b2e3728454d1c288f437fa6a3c8c.tar.bz2
gentoo-2-8d3a3b7f6978b2e3728454d1c288f437fa6a3c8c.zip
Anothe linking fix
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Diffstat (limited to 'dev-tcltk/tcl-sql')
-rw-r--r--dev-tcltk/tcl-sql/ChangeLog8
-rw-r--r--dev-tcltk/tcl-sql/files/ldflags.patch2
-rw-r--r--dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild (renamed from dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild)7
3 files changed, 12 insertions, 5 deletions
diff --git a/dev-tcltk/tcl-sql/ChangeLog b/dev-tcltk/tcl-sql/ChangeLog
index cb749d04f070..35782d1e99b7 100644
--- a/dev-tcltk/tcl-sql/ChangeLog
+++ b/dev-tcltk/tcl-sql/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-tcltk/tcl-sql
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/ChangeLog,v 1.5 2010/12/07 18:58:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/ChangeLog,v 1.6 2010/12/15 20:06:31 jlec Exp $
+
+*tcl-sql-20000114-r2 (15 Dec 2010)
+
+ 15 Dec 2010; Justin Lecher <jlec@gentoo.org> -tcl-sql-20000114-r1.ebuild,
+ +tcl-sql-20000114-r2.ebuild, files/ldflags.patch:
+ Anothe linking fix
*tcl-sql-20000114-r1 (07 Dec 2010)
diff --git a/dev-tcltk/tcl-sql/files/ldflags.patch b/dev-tcltk/tcl-sql/files/ldflags.patch
index 571ff9d0c4d7..2099ed115f95 100644
--- a/dev-tcltk/tcl-sql/files/ldflags.patch
+++ b/dev-tcltk/tcl-sql/files/ldflags.patch
@@ -22,7 +22,7 @@ index 81a80ea..7738920 100644
sql.so: $(OBJS)
- $(LD) $(OBJS) $(EXTRA_LINKS) $(LD_FLAGS) $(EXTRA_LD_FLAGS) -o sql.so
-+ $(CXX) $(LDFLAGS) $(OBJS) $(EXTRA_LINKS) $(LD_FLAGS) $(EXTRA_LD_FLAGS) -o sql.so
++ $(CXX) $(LDFLAGS) $(EXTRA_LINKS) $(OBJS) -o sql.so $(LD_FLAGS) $(EXTRA_LD_FLAGS) -ltcl
clean:
@ rm -f *~ $(OBJ_DIR)/*.o sql.so
diff --git a/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
index 1aaf9af2e67b..6edc5d265153 100644
--- a/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild
+++ b/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/tcl-sql-20000114-r1.ebuild,v 1.2 2010/12/07 18:59:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl-sql/tcl-sql-20000114-r2.ebuild,v 1.1 2010/12/15 20:06:31 jlec Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tcl-sql/${PN}-${PV}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="
@@ -31,7 +31,8 @@ src_prepare() {
}
src_install() {
- dolib.so sql.so || die
+ exeinto /usr/$(get_libdir)/${P}
+ doexe sql.so || die
dodoc CHANGES.txt CODE_DESCRIPTION.txt docs/sample.full.txt docs/sample.simple.txt || die
dohtml README.html docs/api.html || die
}