diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-06-10 17:51:47 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-06-10 17:51:47 +0000 |
| commit | 5075f2c742ee0c528b16bc31b7e46790aae2aa67 (patch) | |
| tree | cb90611fe874a1929bf2e8c232bd43916a25e2df /sys-devel | |
| parent | fix0r for compile error (secondary_memory) (diff) | |
| download | gentoo-2-5075f2c742ee0c528b16bc31b7e46790aae2aa67.tar.gz gentoo-2-5075f2c742ee0c528b16bc31b7e46790aae2aa67.tar.bz2 gentoo-2-5075f2c742ee0c528b16bc31b7e46790aae2aa67.zip | |
update version checking
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.1-r6.ebuild | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 9ad64e9e37a5..87a64ec0210a 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for sys-devel/gcc # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.16 2002/06/09 23:04:39 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.17 2002/06/10 17:51:47 azarah Exp $ *gcc-3.1-r6 (10 June 2002) + 11 June 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1-r6.ebuild : + + Update version checking. + 10 June 2002; Bart Verwilst <verwilst@gentoo.org> Changelog: Remove curses.h and ncurses.h from the installation, so it doesn't diff --git a/sys-devel/gcc/gcc-3.1-r6.ebuild b/sys-devel/gcc/gcc-3.1-r6.ebuild index 9d7d0a71d914..947466e9e0ff 100644 --- a/sys-devel/gcc/gcc-3.1-r6.ebuild +++ b/sys-devel/gcc/gcc-3.1-r6.ebuild @@ -26,26 +26,24 @@ RDEPEND="virtual/glibc >=sys-libs/zlib-1.1.4" if [ -z "`use build`" ] then - DEPEND="$DEPEND - nls? ( sys-devel/gettext ) + DEPEND="${DEPEND} + nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2-r2" - RDEPEND="$RDEPEND + RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2-r2" fi -# necessary because gcc-3.1 does gcc --version different. really -# different -gcc_version() { - gcc -v 2>&1 |tail -1 |cut -d\ -f3-3 -} - build_multiple() { #try to make sure that we should build multiple #versions of gcc (dual install of gcc2 and gcc3) profile="`readlink /etc/make.profile`" + # [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ] + # + # Check the major and minor versions only, and drop the micro version. + # This is done, as compadibility only differ when major and minor differ. if [ -z "`use build`" ] && \ [ -z "`use bootstrap`" ] && \ - [ "`gcc_version | cut -f1 -d.`" -ne 3 ] && \ + [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ] && \ [ "${profile/gcc3}" = "${profile}" ] && \ [ "${GCCBUILD}" != "default" ] then @@ -300,7 +298,7 @@ src_install() { ln -sf libgcc_s-${PV}.so.1 libgcc_s.so.1 ln -sf libgcc_s.so.1 libgcc_s.so rm -f ${D}${LOC}/lib/libgcc_s.so* - rm -f ${D} + cd ${S} if [ -z "`use build`" ] then @@ -343,9 +341,7 @@ src_install() { fi # Fix ncurses b0rking - cd ${D} - rm -f `find ${D} -name "curses.h"` - + find ${D}/ -name '*curses.h' -exec rm -f {} \; } pkg_postrm() { |