summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-12-21 10:22:14 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-12-21 10:22:14 +0000
commit47b3a38e300d2e65bfaefaa49949a10d8a7226a9 (patch)
treed9c5b19afb2e71c1e2d7ef281a58456b627d1689 /dev-lang
parentStable on x86 per security bug 68976 (diff)
downloadhistorical-47b3a38e300d2e65bfaefaa49949a10d8a7226a9.tar.gz
historical-47b3a38e300d2e65bfaefaa49949a10d8a7226a9.tar.bz2
historical-47b3a38e300d2e65bfaefaa49949a10d8a7226a9.zip
Made tcl multilib friendly.
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/tcl/ChangeLog6
-rw-r--r--dev-lang/tcl/Manifest15
-rw-r--r--dev-lang/tcl/files/tcl-8.4.6-multilib.patch24
-rw-r--r--dev-lang/tcl/tcl-8.4.6-r1.ebuild46
4 files changed, 65 insertions, 26 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index dd2144fef372..f8f115a96518 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/tcl
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.44 2004/11/01 18:14:43 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.45 2004/12/21 10:22:13 eradicator Exp $
+
+ 21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/tcl-8.4.6-multilib.patch, tcl-8.4.6-r1.ebuild:
+ Made tcl multilib friendly.
01 Nov 2004; Lars Weiler <pylon@gentoo.org> tcl-8.4.6-r1.ebuild:
Stable on ppc for PHP5, Bug #60442.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 7819cd0680c2..cdca9a1b05fd 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,8 +1,19 @@
-MD5 f95bf32fd19ead64f5fdb1855b08fa75 ChangeLog 5805
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02df4ae9a9f3904ad46f63197732f47a ChangeLog 5954
MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
MD5 2cfd331c4234b3d109bf51d1697bd461 tcl-8.3.4.ebuild 2538
MD5 d2bf35d1b9d4e346394bc2a823fcdf02 tcl-8.4.6.ebuild 2921
-MD5 4683e2041606ed608059ea7d45fa7e60 tcl-8.4.6-r1.ebuild 2963
+MD5 7403668da76af3e24af218fac5e6e527 tcl-8.4.6-r1.ebuild 3157
MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
+MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBx/lfArHZZzCEUG0RAq/nAJ9+gv25UKp1oHCideDEzn7YRYvQ6gCfYge0
+OJbPa9z6irnqq3OmluU5JC4=
+=CHd2
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/files/tcl-8.4.6-multilib.patch b/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
new file mode 100644
index 000000000000..d193064ab607
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
@@ -0,0 +1,24 @@
+diff -Naur tcl8.4.6.orig/unix/configure tcl8.4.6/unix/configure
+--- tcl8.4.6.orig/unix/configure 2004-03-01 15:58:59.000000000 -0800
++++ tcl8.4.6/unix/configure 2004-12-21 01:58:16.250206343 -0800
+@@ -7248,7 +7248,7 @@
+
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+ TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+ TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+ TCL_PACKAGE_PATH="${prefix}/lib"
+diff -Naur tcl8.4.6.orig/unix/configure.in tcl8.4.6/unix/configure.in
+--- tcl8.4.6.orig/unix/configure.in 2004-03-01 15:58:59.000000000 -0800
++++ tcl8.4.6/unix/configure.in 2004-12-21 01:57:58.059204301 -0800
+@@ -510,7 +510,7 @@
+
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+ TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+ TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+ TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/tcl-8.4.6-r1.ebuild b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
index 73269f2422bd..0efc59616963 100644
--- a/dev-lang/tcl/tcl-8.4.6-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.3 2004/11/01 18:14:43 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.4 2004/12/21 10:22:13 eradicator Exp $
inherit eutils
@@ -31,6 +31,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-multilib.patch
+}
+
src_compile() {
local local_config_use=""
@@ -40,13 +46,7 @@ src_compile() {
fi
cd ${S}/unix
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- ${local_config_use} \
- || die
-
+ econf ${local_config_use} || die
emake CFLAGS="${CFLAGS}" || die
}
@@ -59,26 +59,26 @@ src_install() {
S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
# fix the tclConfig.sh to eliminate refs to the build directory
- sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/lib," \
- -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/lib/tcl${v1}/include'," \
- -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/lib," \
- -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/lib," \
+ sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+ -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
+ -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
+ -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
-e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
- ${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
- mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
+ ${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
+ mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
# install private headers
- dodir /usr/lib/tcl${v1}/include/unix
- install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tcl${v1}/include/unix
- dodir /usr/lib/tcl${v1}/include/generic
- install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tcl${v1}/include/generic
- rm -f ${D}/usr/lib/tcl${v1}/include/generic/tcl.h
- rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclDecls.h
- rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h
+ dodir /usr/$(get_libdir)/tcl${v1}/include/unix
+ install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
+ dodir /usr/$(get_libdir)/tcl${v1}/include/generic
+ install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
+ rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
# install symlink for libraries
- dosym /usr/lib/libtcl${v1}.so /usr/lib/libtcl.so
- dosym /usr/lib/libtclstub${v1}.a /usr/lib/libtclstub.a
+ dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
+ dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
ln -sf tclsh${v1} ${D}/usr/bin/tclsh