diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-02-11 06:15:03 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-11 06:15:03 +0000 |
commit | a8badc89e898a29f7fd409924337f4f65fe5ed13 (patch) | |
tree | 3a860d02a844d5d765ba8ab96e99d8c4545d3523 /sys-devel | |
parent | Version bump. (diff) | |
download | gentoo-2-a8badc89e898a29f7fd409924337f4f65fe5ed13.tar.gz gentoo-2-a8badc89e898a29f7fd409924337f4f65fe5ed13.tar.bz2 gentoo-2-a8badc89e898a29f7fd409924337f4f65fe5ed13.zip |
Add patch to fix longopts handling #51525 and a patch from fedora to fix saved register handling.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-devel')
-rw-r--r-- | sys-devel/bc/ChangeLog | 12 | ||||
-rw-r--r-- | sys-devel/bc/bc-1.06-r5.ebuild | 4 | ||||
-rw-r--r-- | sys-devel/bc/bc-1.06-r6.ebuild | 71 | ||||
-rw-r--r-- | sys-devel/bc/files/bc-1.06-longopts.patch | 28 | ||||
-rw-r--r-- | sys-devel/bc/files/bc-1.06-static-save.patch | 16 | ||||
-rw-r--r-- | sys-devel/bc/files/digest-bc-1.06-r6 | 1 |
6 files changed, 128 insertions, 4 deletions
diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog index d627f77ee3fa..3bec70f03c46 100644 --- a/sys-devel/bc/ChangeLog +++ b/sys-devel/bc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-devel/bc -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.16 2004/11/08 06:09:01 vapier Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.17 2005/02/11 06:15:03 vapier Exp $ + +*bc-1.06-r6 (11 Feb 2005) + + 11 Feb 2005; Mike Frysinger <vapier@gentoo.org> + +files/bc-1.06-longopts.patch, +files/bc-1.06-static-save.patch, + +bc-1.06-r6.ebuild: + Add patch to fix longopts handling #51525 and a patch from fedora to fix + saved register handling. 08 Nov 2004; Mike Frysinger <vapier@gentoo.org> bc-1.06-r5.ebuild: USE=static support #70276 by Sascha Silbe. diff --git a/sys-devel/bc/bc-1.06-r5.ebuild b/sys-devel/bc/bc-1.06-r5.ebuild index 682fbe4e43b9..3de1e1200257 100644 --- a/sys-devel/bc/bc-1.06-r5.ebuild +++ b/sys-devel/bc/bc-1.06-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.19 2004/12/06 06:38:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.20 2005/02/11 06:15:03 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs diff --git a/sys-devel/bc/bc-1.06-r6.ebuild b/sys-devel/bc/bc-1.06-r6.ebuild new file mode 100644 index 000000000000..65f9c8872772 --- /dev/null +++ b/sys-devel/bc/bc-1.06-r6.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r6.ebuild,v 1.1 2005/02/11 06:15:03 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Handy console-based calculator utility" +HOMEPAGE="http://www.gnu.org/software/bc/bc.html" +SRC_URI="mirror://gnu/bc/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="readline static" + +RDEPEND="readline? ( >=sys-libs/readline-4.1 + >=sys-libs/ncurses-5.2 )" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.47-r10 + sys-devel/flex" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/bc-1.06-info-fix.diff + epatch ${FILESDIR}/bc-1.06-readline42.diff + epatch ${FILESDIR}/bc-1.06-longopts.patch #51525 + epatch ${FILESDIR}/bc-1.06-static-save.patch + sed -i -e '/^AR =/s:.*::' lib/Makefile.in + + # Command line arguments for flex changed from the old + # 2.5.4 to 2.5.22, so fix configure if we are using the + # new flex. Note that flex-2.5.4 prints 'flex version 2.5.4' + # and flex-2.5.22 prints 'flex 2.5.22', bug #10546. + # <azarah@gentoo.org> (23 Oct 2002) + local flmajor="`flex --version | cut -d. -f1`" + local flminor="`flex --version | cut -d. -f2`" + local flmicro="`flex --version | cut -d. -f3`" + if [ "${flmajor/flex* }" -ge 2 -a \ + "${flminor/flex* }" -ge 5 -a \ + "${flmicro/flex* }" -ge 22 ] + then + sed -i -e 's:flex -I8:flex -I:g' \ + configure + fi +} + +src_compile() { + case ${ARCH} in + ppc) filter-flags -O2;; + x86) replace-flags -Os -O2;; + amd64) replace-flags -O? -O0;; + esac + tc-export CC AR RANLIB + + local myconf="" + use static && append-ldflags -static + use readline && myconf="--with-readline" + econf ${myconf} || die + emake || die +} + +src_install() { + into /usr + dobin bc/bc dc/dc || die + + doinfo doc/*.info + doman doc/*.1 + dodoc AUTHORS FAQ NEWS README ChangeLog +} diff --git a/sys-devel/bc/files/bc-1.06-longopts.patch b/sys-devel/bc/files/bc-1.06-longopts.patch new file mode 100644 index 000000000000..f450e3fa0b2e --- /dev/null +++ b/sys-devel/bc/files/bc-1.06-longopts.patch @@ -0,0 +1,28 @@ +a bug in the argument processing of 'bc' (v1.06) prevents it from properly +reading long-format options. + +patch by joe bruin + +http://bugs.gentoo.org/show_bug.cgi?id=51525 + +--- bc-1.06.orig/bc/main.c ++++ bc-1.06/bc/main.c +@@ -63,7 +63,7 @@ + printf ("usage: %s [options] [file ...]\n%s%s%s%s%s%s%s", progname, + " -h --help print this usage and exit\n", + " -i --interactive force interactive mode\n", +- " -l --mathlib use the predefine math routnes\n", ++ " -l --mathlib use the predefined math routines\n", + " -q --quiet don't print initial banner\n", + " -s --standard non-standard bc constructs are errors\n", + " -w --warn warn about non-standard bc constructs\n", +@@ -93,6 +93,9 @@ + + switch (optch) + { ++ case 0: /* Long option setting a var. */ ++ break; ++ + case 'c': /* compile only */ + compile_only = TRUE; + break; diff --git a/sys-devel/bc/files/bc-1.06-static-save.patch b/sys-devel/bc/files/bc-1.06-static-save.patch new file mode 100644 index 000000000000..0ee543b262ac --- /dev/null +++ b/sys-devel/bc/files/bc-1.06-static-save.patch @@ -0,0 +1,16 @@ +ripped from fedora ! + +--- bc-1.06/bc/load.c.s390 Wed Sep 13 20:22:38 2000 ++++ bc-1.06/bc/load.c Wed Sep 5 16:10:18 2001 +@@ -156,7 +156,10 @@ + long label_no; + long vaf_name; /* variable, array or function number. */ + long func; +- program_counter save_adr; ++ /* Make save_adr static. Otherwise the whole address save stuff doesn't make ++ any sense at all and break e.g. on S390. ++ 09/05/01 Phil Knirsch <pknirsch@redhat.de> */ ++ static program_counter save_adr; + + /* Initialize. */ + str = code; diff --git a/sys-devel/bc/files/digest-bc-1.06-r6 b/sys-devel/bc/files/digest-bc-1.06-r6 new file mode 100644 index 000000000000..e470cb55f0e4 --- /dev/null +++ b/sys-devel/bc/files/digest-bc-1.06-r6 @@ -0,0 +1 @@ +MD5 d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz 278926 |