From 982defac9cdc93795301ccefaf46f484d5855c42 Mon Sep 17 00:00:00 2001 From: Valentin Ziegler Date: Thu, 1 Jan 2004 21:07:27 +0000 Subject: [PATCH] Valentin Ziegler: corrected flex command line options in configure script git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2090 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/bc/bc.cache | 2 +- package/base/bc/bc.conf | 2 +- package/base/bc/bc.desc | 2 +- package/base/bc/fix-flex-options.patch | 30 ++++++++++++++++++++++++ package/base/bc/readline-prototype.patch | 17 ++++++-------- 5 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 package/base/bc/fix-flex-options.patch diff --git a/package/base/bc/bc.cache b/package/base/bc/bc.cache index 21d2729e7..8e32a1ef1 100644 --- a/package/base/bc/bc.cache +++ b/package/base/bc/bc.cache @@ -6,7 +6,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/bc/bc.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/bc/bc.conf b/package/base/bc/bc.conf index 6d8be4c7b..565cc3df2 100644 --- a/package/base/bc/bc.conf +++ b/package/base/bc/bc.conf @@ -6,7 +6,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/bc/bc.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/base/bc/bc.desc b/package/base/bc/bc.desc index 7f5f3be57..27b138d69 100644 --- a/package/base/bc/bc.desc +++ b/package/base/bc/bc.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/base/bc/bc.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/base/bc/fix-flex-options.patch b/package/base/bc/fix-flex-options.patch new file mode 100644 index 000000000..5564cf6a4 --- /dev/null +++ b/package/base/bc/fix-flex-options.patch @@ -0,0 +1,30 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/bc/fix-flex-options.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- bc-1.06/configure.old 2004-01-01 21:59:26.000000000 +0100 ++++ bc-1.06/configure 2004-01-01 21:59:49.000000000 +0100 +@@ -2245,7 +2245,7 @@ + + + if test "$LEX" = "flex" ; then +- LEX="flex -I8" ++ LEX="flex -I -8" + else + if test "$bcrl" = "y" ; then + echo "configure: warning: readline works only with flex." 1>&2 diff --git a/package/base/bc/readline-prototype.patch b/package/base/bc/readline-prototype.patch index e67312a14..ec278d486 100644 --- a/package/base/bc/readline-prototype.patch +++ b/package/base/bc/readline-prototype.patch @@ -6,17 +6,14 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/bc/readline-prototype.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # # --- ROCK-COPYRIGHT-NOTE-END ---