summaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorJuergen Daubert <jue@jue.li>2014-03-27 17:46:37 +0100
committerJuergen Daubert <jue@jue.li>2014-03-27 17:46:37 +0100
commitec5f60af14186e285a585214282782ccd1045b13 (patch)
treed0632a4dd1f79083ef9ad71286e2ab30c1b73617 /ruby
parentffde6d2f11eadc76482c8e0315d3556f9460d575 (diff)
downloadopt-ec5f60af14186e285a585214282782ccd1045b13.tar.gz
opt-ec5f60af14186e285a585214282782ccd1045b13.tar.xz
ruby: apply patch to build with readline 6.3
Diffstat (limited to 'ruby')
-rw-r--r--ruby/.md5sum1
-rw-r--r--ruby/Pkgfile7
-rw-r--r--ruby/ruby-2.1.1-readline-6.3.patch16
3 files changed, 22 insertions, 2 deletions
diff --git a/ruby/.md5sum b/ruby/.md5sum
index d4da5ce11..0369d085a 100644
--- a/ruby/.md5sum
+++ b/ruby/.md5sum
@@ -1 +1,2 @@
+5df0d715820deec596984e90feb6a999 ruby-2.1.1-readline-6.3.patch
53edc33b2f590ecdd9f6a344b9d92d0d ruby-2.1.1.tar.bz2
diff --git a/ruby/Pkgfile b/ruby/Pkgfile
index 165a10027..c8b166dee 100644
--- a/ruby/Pkgfile
+++ b/ruby/Pkgfile
@@ -5,12 +5,15 @@
name=ruby
version=2.1.1
-release=1
-source=(ftp://ftp.ruby-lang.org/pub/$name/2.1/$name-$version.tar.bz2)
+release=2
+source=(ftp://ftp.ruby-lang.org/pub/$name/2.1/$name-$version.tar.bz2
+ $name-$version-readline-6.3.patch)
build () {
cd $name-$version
+ patch -p0 -i $SRC/$name-$version-readline-6.3.patch
+
./configure --prefix=/usr \
--mandir=/usr/man \
--enable-shared \
diff --git a/ruby/ruby-2.1.1-readline-6.3.patch b/ruby/ruby-2.1.1-readline-6.3.patch
new file mode 100644
index 000000000..4458127a1
--- /dev/null
+++ b/ruby/ruby-2.1.1-readline-6.3.patch
@@ -0,0 +1,16 @@
+# https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/45225
+
+
+Index: ext/readline/readline.c
+===================================================================
+--- ext/readline/readline.c (revision 45224)
++++ ext/readline/readline.c (revision 45225)
+@@ -1974,7 +1974,7 @@
+
+ rl_attempted_completion_function = readline_attempted_completion_function;
+ #if defined(HAVE_RL_PRE_INPUT_HOOK)
+- rl_pre_input_hook = (Function *)readline_pre_input_hook;
++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+ #endif
+ #ifdef HAVE_RL_CATCH_SIGNALS
+ rl_catch_signals = 0;

Generated by cgit