Attachment 162400 Details for Bug 203988 – [patch] fix --with-libedit/readline* configuration arg spellings and enable them for libedit in the readline module's extconf.rb

[patch] [patch] fix --with-libedit/readline* configuration arg spellings and enable them for libedit in the readline module's extconf.rb

pr-ruby-libedit-fixes.diff (text/plain), 5.11 KB, created by John Hein on 2015-10-23 19:31:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2015-10-23 19:31:07 UTC

Size: 5.11 KB

patch

obsolete

>Index: lang/ruby20/Makefile
>===================================================================
>--- lang/ruby20/Makefile	(revision 399965)
>+++ lang/ruby20/Makefile	(working copy)
>@@ -59,11 +59,11 @@
> 			dot:${PORTSDIR}/graphics/graphviz
> CAPIDOCS_CONFIGURE_ENABLE=	install-capi
> LIBEDIT_BUILD_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
>-LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
>+LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
> LIBEDIT_RUN_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
> RDOC_CONFIGURE_ENABLE=	install-rdoc
> READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
>-READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-prefix=${LOCALBASE}
>+READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${READLINEPREFIX}
> READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
> 
> CPE_VENDOR=	ruby-lang
>Index: lang/ruby20/files/patch-ext_readline_extconf.rb
>===================================================================
>--- lang/ruby20/files/patch-ext_readline_extconf.rb	(revision 399965)
>+++ lang/ruby20/files/patch-ext_readline_extconf.rb	(working copy)
>@@ -1,6 +1,14 @@
>---- ext/readline/extconf.rb.orig	2014-04-30 07:39:45 UTC
>-+++ ext/readline/extconf.rb
>-@@ -62,7 +62,7 @@ else
>+--- ext/readline/extconf.rb.orig	2014-05-01 11:59:37.000000000 +0000
>++++ ext/readline/extconf.rb	2015-10-23 04:05:44.000000000 +0000
>+@@ -37,6 +37,7 @@
>+ case enable_libedit
>+ when true
>+   # --enable-libedit
>++  dir_config("libedit")
>+   unless (readline.have_header("editline/readline.h") ||
>+           readline.have_header("readline/readline.h")) &&
>+           have_library("edit", "readline")
>+@@ -62,7 +63,7 @@ else
>  end
>  
>  readline.have_func("rl_getc")
>Index: lang/ruby21/Makefile
>===================================================================
>--- lang/ruby21/Makefile	(revision 399965)
>+++ lang/ruby21/Makefile	(working copy)
>@@ -62,11 +62,11 @@
> GMP_CONFIGURE_WITH=	gmp
> GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
> LIBEDIT_BUILD_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
>-LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
>+LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
> LIBEDIT_RUN_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
> RDOC_CONFIGURE_ENABLE=	install-rdoc
> READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
>-READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-prefix=${LOCALBASE}
>+READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${READLINEPREFIX}
> READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
> 
> CPE_VENDOR=	ruby-lang
>Index: lang/ruby21/files/patch-ext_readline_extconf.rb
>===================================================================
>--- lang/ruby21/files/patch-ext_readline_extconf.rb	(revision 399965)
>+++ lang/ruby21/files/patch-ext_readline_extconf.rb	(working copy)
>@@ -1,6 +1,14 @@
>---- ext/readline/extconf.rb.orig	2015-01-23 15:37:01 UTC
>-+++ ext/readline/extconf.rb
>-@@ -62,7 +62,7 @@ else
>+--- ext/readline/extconf.rb.orig	2014-05-01 11:59:37.000000000 +0000
>++++ ext/readline/extconf.rb	2015-10-23 04:05:44.000000000 +0000
>+@@ -37,6 +37,7 @@
>+ case enable_libedit
>+ when true
>+   # --enable-libedit
>++  dir_config("libedit")
>+   unless (readline.have_header("editline/readline.h") ||
>+           readline.have_header("readline/readline.h")) &&
>+           have_library("edit", "readline")
>+@@ -62,7 +63,7 @@ else
>  end
>  
>  readline.have_func("rl_getc")
>Index: lang/ruby22/Makefile
>===================================================================
>--- lang/ruby22/Makefile	(revision 399965)
>+++ lang/ruby22/Makefile	(working copy)
>@@ -62,11 +62,11 @@
> GMP_CONFIGURE_WITH=	gmp
> GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
> LIBEDIT_BUILD_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
>-LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
>+LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LIBEDITPREFIX}
> LIBEDIT_RUN_DEPENDS=	libedit>=0:${PORTSDIR}/devel/libedit
> RDOC_CONFIGURE_ENABLE=	install-rdoc
> READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
>-READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-prefix=${LOCALBASE}
>+READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${READLINEPREFIX}
> READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
> 
> CPE_VENDOR=	ruby-lang
>Index: lang/ruby22/files/patch-ext_readline_extconf.rb
>===================================================================
>--- lang/ruby22/files/patch-ext_readline_extconf.rb	(revision 399965)
>+++ lang/ruby22/files/patch-ext_readline_extconf.rb	(working copy)
>@@ -1,6 +1,14 @@
>---- ext/readline/extconf.rb.orig	2015-01-16 23:05:12 UTC
>-+++ ext/readline/extconf.rb
>-@@ -62,7 +62,7 @@ else
>+--- ext/readline/extconf.rb.orig	2014-05-01 11:59:37.000000000 +0000
>++++ ext/readline/extconf.rb	2015-10-23 04:05:44.000000000 +0000
>+@@ -37,6 +37,7 @@
>+ case enable_libedit
>+ when true
>+   # --enable-libedit
>++  dir_config("libedit")
>+   unless (readline.have_header("editline/readline.h") ||
>+           readline.have_header("readline/readline.h")) &&
>+           have_library("edit", "readline")
>+@@ -62,7 +63,7 @@ else
>  end
>  
>  readline.have_func("rl_getc")

Actions: View | Diff

Attachments on bug 203988: 162400 | 162749