svn commit: r415177 - in branches/2016Q2/devel/gdb: . files

[Thomas Zander]

Author: riggs
Date: Sat May 14 07:54:43 2016
New Revision: 415177
URL: https://svnweb.freebsd.org/changeset/ports/415177

Log:
  MFH: r415176
  
  Fix build with libreadline from base system (via BASE_READLINE OPTION)
  
  PR:		209431
  Submitted by:	luca.pizzamiglio at gmail.com (maintainer)
  Approved by:	ports-secteam (build fix blanket)

Added:
  branches/2016Q2/devel/gdb/files/extrapatch-base-readline
     - copied unchanged from r415176, head/devel/gdb/files/extrapatch-base-readline
Modified:
  branches/2016Q2/devel/gdb/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/devel/gdb/Makefile
==============================================================================
--- branches/2016Q2/devel/gdb/Makefile	Sat May 14 07:50:49 2016	(r415176)
+++ branches/2016Q2/devel/gdb/Makefile	Sat May 14 07:54:43 2016	(r415177)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -45,7 +45,7 @@ OPTIONS_SINGLE_READLINE=	BASE_READLINE B
 
 GDB_LINK_DESC=		Create ${PREFIX}/bin/gdb symlink
 KGDB_DESC=		Kernel Debugging Support
-BASE_READLINE_DESC=	from base system (experimental)
+BASE_READLINE_DESC=	from base system
 BUNDLED_READLINE_DESC=	from gdb distfile
 PORT_READLINE_DESC=	from devel/readline port
 TUI_DESC=		Text User Interface enabled
@@ -54,6 +54,7 @@ OPTIONS_SUB=	yes
 
 BASE_READLINE_USES=	readline
 BASE_READLINE_CFLAGS=	-D_rl_echoing_p=readline_echoing_p
+BASE_READLINE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-base-readline
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
 DEBUG_CFLAGS=		-g
 EXPAT_CONFIGURE_WITH=	expat

Copied: branches/2016Q2/devel/gdb/files/extrapatch-base-readline (from r415176, head/devel/gdb/files/extrapatch-base-readline)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q2/devel/gdb/files/extrapatch-base-readline	Sat May 14 07:54:43 2016	(r415177, copy of r415176, head/devel/gdb/files/extrapatch-base-readline)
@@ -0,0 +1,11 @@
+--- gdb/completer.c.orig	2016-05-10 14:11:58.546188879 +0200
++++ gdb/completer.c	2016-05-10 14:12:22.899187374 +0200
+@@ -1767,6 +1767,8 @@
+   return displayer->width;
+ }
+ 
++_rl_completion_prefix_display_length=0;
++rl_sort_completion_matches=1;
+ extern int _rl_completion_prefix_display_length;
+ extern int _rl_print_completions_horizontally;
+