OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Aug-2008 16:12:19
Branch: HEAD Handle: 2008082915121900
Added files:
openpkg-src/bc bc.patch
Modified files:
openpkg-src/bc bc.spec
Log:
add readline editing support and get rid of a bunch of compile-time
warnings
Summary:
Revision Changes Path
1.1 +114 -0 openpkg-src/bc/bc.patch
1.35 +9 -2 openpkg-src/bc/bc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bc/bc.patch
============================================================================
$ cvs diff -u -r0 -r1.1 bc.patch
--- /dev/null 2008-08-29 16:12:11 +0200
+++ bc.patch 2008-08-29 16:12:19 +0200
@@ -0,0 +1,114 @@
+Index: bc/Makefile.in
+--- bc/Makefile.in.orig 2000-11-15 21:19:14 +0100
++++ bc/Makefile.in 2008-08-29 16:09:30 +0200
+@@ -85,7 +85,7 @@
+
+ YFLAGS = -d
+
+-CFLAGS = @CFLAGS@ -Wall -funsigned-char
++CFLAGS = @CFLAGS@ -funsigned-char
+
+ fbcOBJ = main.o bc.o scan.o execute.o global.o load.o storage.o util.o
+
+Index: bc/scan.l
+--- bc/scan.l.orig 2000-09-13 20:25:47 +0200
++++ bc/scan.l 2008-08-29 16:09:30 +0200
+@@ -142,8 +142,6 @@
+ static int rl_len = 0;
+
+ /* Definitions for readline access. */
+-extern FILE *rl_instream;
+-_PROTOTYPE(char *readline, (char *));
+
+ /* 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
+Index: configure
+--- configure.orig 2000-10-03 20:34:24 +0200
++++ configure 2008-08-29 16:09:30 +0200
+@@ -1985,8 +1985,8 @@
+ echo "$ac_t""no" 1>&6
+ fi
+
+- LDSAVE=$LDFLAGS
+- LDFLAGS="$LDFLAGS $TERMLIB"
++ LIBS_SAVE=$LIBS
++ LIBS="$LIBS $TERMLIB"
+ echo $ac_n "checking for el_gets in -ledit""... $ac_c" 1>&6
+ echo "configure:1992: checking for el_gets in -ledit" >&5
+ ac_lib_var=`echo edit'_'el_gets | sed 'y%./+-%__p_%'`
+@@ -2067,7 +2067,7 @@
+ EOF
+
+ fi
+- LDFLAGS=$LDSAVE
++ LIBS=$LIBS_SAVE
+
+ fi
+
+@@ -2157,8 +2157,8 @@
+
+ fi
+
+- LDSAVE=$LDFLAGS
+- LDFLAGS="$LDFLAGS $TERMLIB"
++ LIBS_SAVE=$LIBS
++ LIBS="$LIBS $TERMLIB"
+ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+ echo "configure:2164: checking for readline in -lreadline" >&5
+ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+@@ -2239,7 +2239,7 @@
+ EOF
+
+ fi
+- LDFLAGS=$LDSAVE
++ LIBS=$LIBS_SAVE
+
+ fi
+
+Index: dc/Makefile.in
+--- dc/Makefile.in.orig 2000-11-15 21:19:16 +0100
++++ dc/Makefile.in 2008-08-29 16:09:30 +0200
+@@ -76,7 +76,7 @@
+
+ MAINTAINERCLEANFILES = Makefile.in
+
+-CFLAGS = @CFLAGS@ -Wall -funsigned-char
++CFLAGS = @CFLAGS@ -funsigned-char
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+Index: lib/Makefile.in
+--- lib/Makefile.in.orig 2000-11-15 21:19:13 +0100
++++ lib/Makefile.in 2008-08-29 16:09:30 +0200
+@@ -74,7 +74,7 @@
+
+ DEFS = @DEFS@ $(DEFSADD)
+
+-CFLAGS = @CFLAGS@ -Wall -funsigned-char
++CFLAGS = @CFLAGS@ -funsigned-char
+
+ MAINTAINERCLEANFILES = Makefile.in number.c
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+Index: lib/getopt.c
+--- lib/getopt.c.orig 2000-07-08 01:34:09 +0200
++++ lib/getopt.c 2008-08-29 16:09:30 +0200
+@@ -43,6 +43,7 @@
+ #endif
+
+ #include <stdio.h>
++#include <string.h>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+Index: lib/number.c
+--- lib/number.c.orig 2000-10-03 20:34:25 +0200
++++ lib/number.c 2008-08-29 16:09:56 +0200
+@@ -34,6 +34,8 @@
+ #include <number.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <ctype.h>/* Prototypes needed for external utility routines. */
+
+ #define bc_rt_warn rt_warn
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bc/bc.spec
============================================================================
$ cvs diff -u -r1.34 -r1.35 bc.spec
--- openpkg-src/bc/bc.spec 1 Jan 2008 14:51:16 -0000 1.34
+++ openpkg-src/bc/bc.spec 29 Aug 2008 14:12:19 -0000 1.35
@@ -32,16 +32,19 @@
Group: Algorithm
License: GPL
Version: 1.06
-Release: 20080101
+Release: 20080829
# list of sources
Source0: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz
+Patch0: bc.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, flex, gcc
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: readline, ncurses
+PreReq: readline, ncurses
AutoReq: no
AutoReqProv: no
@@ -60,12 +63,16 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
+ CPPFLAGS="%{l_cppflags}" \
CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
- --prefix=$RPM_BUILD_ROOT%{l_prefix}
+ --prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ --with-readline
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
