OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Mar-2009 15:09:34
Branch: HEAD Handle: 2009030714093400
Added files:
openpkg-src/readline readline.patch
Modified files:
openpkg-src/readline readline.spec
Log:
avoid symbol conflicts between readline's xmalloc stuff and variants
of an application using readline
Summary:
Revision Changes Path
1.6 +14 -0 openpkg-src/readline/readline.patch
1.48 +3 -1 openpkg-src/readline/readline.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/readline/readline.patch
============================================================================
$ cvs diff -u -r0 -r1.6 readline.patch
--- /dev/null 2009-03-07 15:09:29 +0100
+++ readline.patch 2009-03-07 15:09:34 +0100
@@ -0,0 +1,14 @@
+Index: xmalloc.h
+--- xmalloc.h.orig 2009-01-04 20:32:34 +0100
++++ xmalloc.h 2009-03-07 15:05:14 +0100
+@@ -38,6 +38,10 @@
+
+ #endif /* !PTR_T */
+
++#define xmalloc readline_xmalloc
++#define xrealloc readline_xrealloc
++#define xfree readline_xfree
++
+ extern PTR_T xmalloc PARAMS((size_t));
+ extern PTR_T xrealloc PARAMS((void *, size_t));
+ extern void xfree PARAMS((void *));
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/readline/readline.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 readline.spec
--- openpkg-src/readline/readline.spec 23 Feb 2009 11:00:23 -0000
1.47
+++ openpkg-src/readline/readline.spec 7 Mar 2009 14:09:34 -0000
1.48
@@ -38,11 +38,12 @@
Group: Terminal
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20090223
+Release: 20090307
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/readline-%{V_base_real}.tar.gz
Source1: readline.pc
+Patch0: readline.patch
# build information
Prefix: %{l_prefix}
@@ -69,6 +70,7 @@
%prep
%setup -q -n readline-%{V_base_real}
+ %patch -p0
%build
# configure package
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
