diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-17 06:57:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-17 06:57:17 +0000 |
| commit | dc334b473aec6797a4d0c67fc44c6572ed24d892 (patch) | |
| tree | aa6482b940d8608aaa1a012bfc61dd6cd28cf92a /dev-libs/glib | |
| parent | Remove useless C++ checks #74485. (Manifest recommit) (diff) | |
| download | gentoo-2-dc334b473aec6797a4d0c67fc44c6572ed24d892.tar.gz gentoo-2-dc334b473aec6797a4d0c67fc44c6572ed24d892.tar.bz2 gentoo-2-dc334b473aec6797a4d0c67fc44c6572ed24d892.zip | |
Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt actually do anything).
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/glib-1.2.10-r5.ebuild | 36 |
2 files changed, 13 insertions, 29 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index b1663f77a8bf..0f6d819d22cb 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.108 2004/12/16 10:15:13 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.109 2004/12/17 06:57:17 vapier Exp $ + + 17 Dec 2004; Mike Frysinger <vapier@gentoo.org> glib-1.2.10-r5.ebuild: + Clean up ebuild and dont bother calling elibtoolize anymore (since it doesnt + actually do anything). 16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> glib-2.4.7.ebuild: Stable on amd64. diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild index 77f15a8ecd4d..839739b63e44 100644 --- a/dev-libs/glib/glib-1.2.10-r5.ebuild +++ b/dev-libs/glib/glib-1.2.10-r5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.35 2004/11/12 21:18:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.36 2004/12/17 06:57:17 vapier Exp $ -inherit libtool gnuconfig flag-o-matic eutils +inherit libtool flag-o-matic eutils DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" @@ -19,33 +19,13 @@ DEPEND="virtual/libc" src_unpack() { unpack ${A} - # Allow glib to build with gcc-3.4.x - # Closes Bug #47047 + # Allow glib to build with gcc-3.4.x #47047 epatch ${FILESDIR}/${P}-gcc34-fix.patch + + uclibctoolize } src_compile() { - elibtoolize - - # elibtoolize breaks (see brad's comments below, left here for - # historical purposes) but libtoolize won't work either because - # there is no libtoolize in the stage1 and it brings in nasty - # deps if you try to install it during bootstrap. - # elibtoolize seems to be working decently on x86. As a temporary - # fix for amd64 users to be able to bootstrap, we run gnuconfig. - # The glib .a's will be broken, but it's a start. - # See bug 47950 for more information. - # -- avenj@gentoo.org 19 Apr 04 - - gnuconfig_update - - - # For some reason, elibtoolize stopped doing its job in the last couple - # of days on this ebuild, and amd64 won't compile it anymore, need to - # manually run libtoolize, I need to inspect the libtool.eclass I guess. - # Brad House <brad_mssw@gentoo.org> 1/2/2004 -# libtoolize -c -f - # Bug 48839: pam fails to build on ia64 # The problem is that it attempts to link a shared object against # libglib.a; this library needs to be built with -fPIC. Since @@ -55,13 +35,13 @@ src_compile() { econf \ --with-threads=posix \ - --enable-debug=yes || die - + --enable-debug=yes \ + || die emake || die } src_install() { - einstall || die + make install DESTDIR="${D}" || die dodoc AUTHORS ChangeLog README* INSTALL NEWS dohtml -r docs |