瀏覽代碼

avoid symbol conflicts between readline's xmalloc stuff and variants of an application using readline

Ralf S. Engelschall 16 年之前
父節點
當前提交
763916a201
共有 2 個文件被更改,包括 17 次插入1 次删除
  1. 14 0
      readline/readline.patch
  2. 3 1
      readline/readline.spec

+ 14 - 0
readline/readline.patch

@@ -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 *));

+ 3 - 1
readline/readline.spec

@@ -38,11 +38,12 @@ Class:        BASE
 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 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n readline-%{V_base_real}
+    %patch -p0
 
 %build
     #   configure package