diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-12-21 11:07:23 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-12-21 11:07:23 +0000 |
| commit | b8ff48478802fcbe7be6843e2b986a08717d6a20 (patch) | |
| tree | aea25da13eb669c9da070303919c9ed2fc90c011 /dev-lang/tk | |
| parent | Stable on alpha, bug 68976. (Manifest recommit) (diff) | |
| download | gentoo-2-b8ff48478802fcbe7be6843e2b986a08717d6a20.tar.gz gentoo-2-b8ff48478802fcbe7be6843e2b986a08717d6a20.tar.bz2 gentoo-2-b8ff48478802fcbe7be6843e2b986a08717d6a20.zip | |
Multilib fixes.
Diffstat (limited to 'dev-lang/tk')
| -rw-r--r-- | dev-lang/tk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.4.6-r1.ebuild | 34 |
2 files changed, 22 insertions, 17 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index e96d8ca28ca1..f177a2455e33 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/tk # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.48 2004/11/09 23:35:08 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.49 2004/12/21 11:07:23 eradicator Exp $ + + 21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> tk-8.4.6-r1.ebuild: + Multilib fixes. 10 Nov 2004; Joseph Jezak <josejx@gentoo.org> tk-8.4.6-r1.ebuild: Marked ppc stable. diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild index f266182429ca..a82a9aae1884 100644 --- a/dev-lang/tk/tk-8.4.6-r1.ebuild +++ b/dev-lang/tk/tk-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/tk/tk-8.4.6-r1.ebuild,v 1.10 2004/11/09 23:35:08 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.11 2004/12/21 11:07:23 eradicator Exp $ inherit eutils @@ -54,7 +54,7 @@ src_compile() { fi econf \ - --with-tcl=/usr/lib \ + --with-tcl=/usr/$(get_libdir) \ ${local_config_use} || die emake CFLAGS="${CFLAGS}" || die @@ -70,25 +70,27 @@ src_install() { # fix the tkConfig.sh to eliminate refs to the build directory sed -i \ - -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \ - -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \ - -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \ - -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \ + -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \ + -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \ + -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \ + -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \ + -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \ + -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \ ${D}/usr/lib/tkConfig.sh # install private headers - dodir /usr/lib/tk${v1}/include/unix - install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix - dodir /usr/lib/tk${v1}/include/generic - install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic - rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h - rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h - rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h + dodir /usr/$(get_libdir)/tk${v1}/include/unix + install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix + dodir /usr/$(get_libdir)/tk${v1}/include/generic + install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic + rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h + rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h + rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h # install symlink for libraries - #dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a - dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so - dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a + #dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a + dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so + dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a ln -sf wish${v1} ${D}/usr/bin/wish |