diff options
Diffstat (limited to 'extra/bc')
| -rw-r--r-- | extra/bc/PKGBUILD | 37 | ||||
| -rw-r--r-- | extra/bc/bc-1.06-info-dir-entry.patch | 11 | ||||
| -rw-r--r-- | extra/bc/bc-1.06.95-void_uninitialized.patch | 14 | ||||
| -rw-r--r-- | extra/bc/build-fix.patch | 13 |
4 files changed, 36 insertions, 39 deletions
diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD index 96ab3239b..f323eab0f 100644 --- a/extra/bc/PKGBUILD +++ b/extra/bc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137896 2011-09-12 10:03:30Z pierre $ +# $Id: PKGBUILD 204773 2014-01-26 21:41:56Z andyrtr $ # Maintainer: dorphell <dorphell@archlinux.org> pkgname=bc -pkgver=1.06 -pkgrel=8 +pkgver=1.06.95 +pkgrel=1 pkgdesc="An arbitrary precision calculator language" arch=('i686' 'x86_64') url="http://www.gnu.org/software/bc/" @@ -12,25 +12,32 @@ depends=('readline') replaces=('bc-readline') conflicts=('bc-readline') install=bc.install -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'build-fix.patch' 'bc-1.06-info-dir-entry.patch') -md5sums=('d44b5dddebd8a7a7309aea6c36fda117' - 'fc7ecbd9e55ef04c6d3a495692626116' - 'b6fe9869830aca0d34badf810fe0cfb3') +source=(ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} + bc-1.06.95-void_uninitialized.patch) +md5sums=('5126a721b73f97d715bb72c13c889035' + 'SKIP' + 'fe85d42dd4151801e9b8c2d2c4d990bf') -build() { - export CFLAGS="${CFLAGS/-O?/-O3}" +prepare() { + cd "${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/build-fix.patch" - patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" + # https://bugs.gentoo.org/show_bug.cgi?id=349339 + patch -Np0 -i ${srcdir}/bc-1.06.95-void_uninitialized.patch +} +build() { + cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man \ --infodir=/usr/share/info --with-readline - make LEX="flex -I" + make +} + +check () { + cd "${pkgname}-${pkgver}" + echo "quit" | ./bc/bc -l Test/checklib.b # 10 failures } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/bc/bc-1.06-info-dir-entry.patch b/extra/bc/bc-1.06-info-dir-entry.patch deleted file mode 100644 index 8c1344c82..000000000 --- a/extra/bc/bc-1.06-info-dir-entry.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bc-1.06/doc/bc.info.info-dir-entry 2000-10-03 20:36:31.000000000 +0200 -+++ bc-1.06/doc/bc.info 2003-01-06 14:07:40.000000000 +0100 -@@ -1,5 +1,8 @@ - This is bc.info, produced by makeinfo version 4.0 from bc.texi. - -+START-INFO-DIR-ENTRY -+* bc: (bc). Arbritrary precision calculator language. -+END-INFO-DIR-ENTRY - - File: bc.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) - diff --git a/extra/bc/bc-1.06.95-void_uninitialized.patch b/extra/bc/bc-1.06.95-void_uninitialized.patch new file mode 100644 index 000000000..c60290c4d --- /dev/null +++ b/extra/bc/bc-1.06.95-void_uninitialized.patch @@ -0,0 +1,14 @@ +http://www.pixelbeat.org/programming/oss_bug_flow.html +https://bugs.gentoo.org/349339 + +--- bc/storage.c ++++ bc/storage.c +@@ -99,6 +99,7 @@ + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; + diff --git a/extra/bc/build-fix.patch b/extra/bc/build-fix.patch deleted file mode 100644 index 98a40820a..000000000 --- a/extra/bc/build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l ---- bc-1.06/bc/scan.l 2000-09-13 22:25:47 +0400 -+++ bc-1.06.my/bc/scan.l 2006-12-25 12:39:34 +0300 -@@ -143,7 +143,9 @@ - - /* Definitions for readline access. */ - extern FILE *rl_instream; -+#if 0 - _PROTOTYPE(char *readline, (char *)); -+#endif - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as |