Attachment #138718 for bug #184796




# $FreeBSD$

PORTNAME=	gdb
PORTVERSION=	7.6.2
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	GNU


LICENSE=	GPLv3

USE_BZIP2=	yes
USES=		iconv gmake
USE_CSTD=	gnu89
USES=		iconv gmake
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
		--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \
		--with-separate-debug-dir=/usr/lib/debug \
		${ICONV_CONFIGURE_ARG} \
		--without-libunwind-ia64 \
		--enable-targets=all

CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
CFLAGS+=	-DRL_NO_COMPAT
EXCLUDE=	dejagnu expect sim texinfo intl
EXTRACT_AFTER_ARGS=	${EXCLUDE:S/^/--exclude /}

VER=		${PORTVERSION:S/.//g}
PLIST_SUB=	VER=${VER}
EXTRACT_AFTER_ARGS=	${EXCLUDE:S/^/--exclude /}

ONLY_FOR_ARCHS=	i386 amd64 powerpc powerpc64	# untested elsewhere, might work

OPTIONS_DEFINE=	DEBUG EXPAT GDB_LINK PYTHON THREADS TUI

OPTIONS_DEFAULT=	THREADS TUI GDB_LINK PORT_READLINE

OPTIONS_SINGLE=	READLINE
OPTIONS_SINGLE_READLINE=	BASE_READLINE BUNDLED_READLINE PORT_READLINE

GDB_LINK_DESC=		Create the gdb link
BASE_READLINE_DESC=	from base system(EXPERIMENTAL)
BUNDLED_READLINE_DESC=	from gdb distfile
PORT_READLINE_DESC=	from devel/readline port
GDB_LINK_DESC=		Create the gdb link
TUI_DESC=		Text User Interface enabled
OPTIONS_DEFAULT=	THREADS TUI GDB_LINK PORT_READLINE

OPTIONS_SUB=	yes
OPTIONS_SUB=yes

BASE_READLINE_USES=	readline
BASE_READLINE_CFLAGS=	-D_rl_echoing_p=readline_echoing_p
BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
DEBUG_CFLAGS=		-g
EXPAT_CONFIGURE_ON=	--with-expat=yes
EXPAT_CONFIGURE_OFF=	--without-expat
EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
TUI_CONFIGURE_ENABLE=	tui
PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
PYTHON_CONFIGURE_OFF=	--without-python
PORT_READLINE_USES=	readline:port
TUI_CONFIGURE_ENABLE=	tui
BASE_READLINE_CFLAGS=	-D_rl_echoing_p=readline_echoing_p
BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline

.include <bsd.port.options.mk>

.if ! ${PORT_OPTIONS:MBUNDLED_READLINE}
EXCLUDE+=	readline
.endif


.endif

.if ${PORT_OPTIONS:MTHREADS}
EXTRA_PATCHES=	${FILESDIR}/extrapatch-gdb-configure.tgt \
		${FILESDIR}/extrapatch-gdb-Makefile.in
.endif

.if ${ARCH} == "amd64"

.endif

post-patch:
	@${REINPLACE_CMD} -e 's|$$| [GDB v${PORTVERSION} for FreeBSD]|' \
		${WRKSRC}/gdb/version.in

.if ${PORT_OPTIONS:MTHREADS}
	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
		${STAGEDIR}${PREFIX}/bin/gdb${VER}
	${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 \
		${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1

.if ${PORT_OPTIONS:MTUI}
	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER}
.endif

.if ${PORT_OPTIONS:MGDB_LINK}
	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb
.endif

.if ${PORT_OPTIONS:MPYTHON}
	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )
	(cd ${WRKSRC}/gdb/data-directory ; \
		${GMAKE} DESTDIR=${STAGEDIR} install-python )
.endif

post-install:
.if ${PORT_OPTIONS:MPYTHON}
. for f in gdb gdb/command gdb/function
	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* )
. endfor
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (gdb-7.6.1.tar.bz2) = e3dfa38a14a5457f9b8b26f7b5080ba5491bd10ae4d69bfe357cea87b7d162e4	1	SHA256 (gdb-7.6.2.tar.bz2) = 2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8
2	SIZE (gdb-7.6.1.tar.bz2) = 24338919	2	SIZE (gdb-7.6.2.tar.bz2) = 24269334




--- gdb/common/signals.c.orig	2013-01-01 07:32:54.000000000 +0100
+++ gdb/common/signals.c	2013-11-25 16:12:56.000000000 +0100
@@ -46,6 +46,12 @@
 # endif
 #endif
 
+#ifdef __FreeBSD__
+# ifndef SIGLIBRT
+#  define SIGLIBRT 33 /* Older versions do not define the constant */
+# endif
+#endif
+
 /* This table must match in order and size the signals in enum
    gdb_signal.  */
 
@@ -334,6 +340,11 @@
     return GDB_SIGNAL_INFO;
 #endif
 
+#if defined (SIGLIBRT)
+  if ( hostsig == SIGLIBRT )
+    return GDB_SIGNAL_FBSD_LIBRT;
+#endif
+
 #if defined (REALTIME_LO)
   if (hostsig >= REALTIME_LO && hostsig < REALTIME_HI)
     {
@@ -591,6 +602,11 @@
       return SIGINFO;
 #endif
 
+#if defined (SIGLIBRT)
+    case GDB_SIGNAL_FBSD_LIBRT:
+      return SIGLIBRT;
+#endif
+
     default:
 #if defined (REALTIME_LO)
       retsig = 0;
--- gdb/infrun.c.orig	2013-08-30 17:58:55.000000000 +0200
+++ gdb/infrun.c	2013-11-22 16:12:58.000000000 +0100
@@ -7291,6 +7291,8 @@
   signal_print[GDB_SIGNAL_WINCH] = 0;
   signal_stop[GDB_SIGNAL_PRIO] = 0;
   signal_print[GDB_SIGNAL_PRIO] = 0;
+  signal_stop[GDB_SIGNAL_FBSD_LIBRT] = 0;
+  signal_print[GDB_SIGNAL_FBSD_LIBRT] = 0;
 
   /* These signals are used internally by user-level thread
      implementations.  (See signal(5) on Solaris.)  Like the above
--- include/gdb/signals.def.orig	2013-01-01 07:41:30.000000000 +0100
+++ include/gdb/signals.def	2013-11-25 16:13:42.000000000 +0100
@@ -197,4 +197,5 @@
 /* If you are adding a new signal, add it just above this comment.  */
 
 /* Last and unused enum value, for sizing arrays, etc.  */
-SET (GDB_SIGNAL_LAST, 151, NULL, "GDB_SIGNAL_MAGIC")
+SET (GDB_SIGNAL_FBSD_LIBRT, 151, "SIGLIBRT", "GDB_SIGNAL_FBSD_LIBRT")
+SET (GDB_SIGNAL_LAST, 152, NULL, "GDB_SIGNAL_MAGIC")

Return to bug 184796

Lines 2-9 Link Here

(-)Makefile (-25 / +35 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gdb	4	PORTNAME= gdb
5	PORTVERSION= 7.6.1	5	PORTVERSION= 7.6.2
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= GNU	7	MASTER_SITES= GNU
9		8
Lines 13-24 Link Here
13	LICENSE= GPLv3	12	LICENSE= GPLv3
14		13
15	USE_BZIP2= yes	14	USE_BZIP2= yes
		15	USES= iconv gmake
16	USE_CSTD= gnu89	16	USE_CSTD= gnu89
17	USES= iconv gmake
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc	18	CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
20	CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \	19	CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \
21	--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \	20	--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \
		21	--with-separate-debug-dir=/usr/lib/debug \
22	${ICONV_CONFIGURE_ARG} \	22	${ICONV_CONFIGURE_ARG} \
23	--without-libunwind-ia64 \	23	--without-libunwind-ia64 \
24	--enable-targets=all	24	--enable-targets=all
Lines 25-64 Link Here
25	CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes	25	CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes
26	CFLAGS+= -DRL_NO_COMPAT	26	CFLAGS+= -DRL_NO_COMPAT
27	EXCLUDE= dejagnu expect sim texinfo intl	27	EXCLUDE= dejagnu expect sim texinfo intl
		28	EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /}
		29
28	VER= ${PORTVERSION:S/.//g}	30	VER= ${PORTVERSION:S/.//g}
29	PLIST_SUB= VER=${VER}	31	PLIST_SUB= VER=${VER}
30	EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /}
31		32
32	ONLY_FOR_ARCHS= i386 amd64 powerpc powerpc64 # untested elsewhere, might work	33	ONLY_FOR_ARCHS= i386 amd64 powerpc powerpc64 # untested elsewhere, might work
33		34
34	OPTIONS_DEFINE= DEBUG EXPAT PYTHON THREADS TUI GDB_LINK	35	OPTIONS_DEFINE= DEBUG EXPAT GDB_LINK PYTHON THREADS TUI
		36
		37	OPTIONS_DEFAULT= THREADS TUI GDB_LINK PORT_READLINE
		38
		39	OPTIONS_SINGLE= READLINE
35	OPTIONS_SINGLE_READLINE= BASE_READLINE BUNDLED_READLINE PORT_READLINE	40	OPTIONS_SINGLE_READLINE= BASE_READLINE BUNDLED_READLINE PORT_READLINE
36	OPTIONS_SINGLE= READLINE	41
		42	GDB_LINK_DESC= Create the gdb link
37	BASE_READLINE_DESC= from base system(EXPERIMENTAL)	43	BASE_READLINE_DESC= from base system(EXPERIMENTAL)
38	BUNDLED_READLINE_DESC= from gdb distfile	44	BUNDLED_READLINE_DESC= from gdb distfile
39	PORT_READLINE_DESC= from devel/readline port	45	PORT_READLINE_DESC= from devel/readline port
40	GDB_LINK_DESC= Create the gdb link
41	TUI_DESC= Text User Interface enabled	46	TUI_DESC= Text User Interface enabled
42	OPTIONS_DEFAULT= THREADS TUI GDB_LINK PORT_READLINE
43		47
44	# Activating the plist	48	OPTIONS_SUB= yes
45	OPTIONS_SUB=yes
46		49
		50	BASE_READLINE_USES= readline
		51	BASE_READLINE_CFLAGS= -D_rl_echoing_p=readline_echoing_p
		52	BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline
47	DEBUG_CFLAGS= -g	53	DEBUG_CFLAGS= -g
48	EXPAT_CONFIGURE_ON= --with-expat=yes	54	EXPAT_CONFIGURE_ON= --with-expat=yes
49	EXPAT_CONFIGURE_OFF= --without-expat	55	EXPAT_CONFIGURE_OFF= --without-expat
50	EXPAT_LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2	56	EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
51	TUI_CONFIGURE_ENABLE= tui
52	PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD}	57	PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD}
53	PYTHON_CONFIGURE_OFF= --without-python	58	PYTHON_CONFIGURE_OFF= --without-python
54	PORT_READLINE_USES= readline:port	59	PORT_READLINE_USES= readline:port
55	BASE_READLINE_USES= readline	60	TUI_CONFIGURE_ENABLE= tui
56	BASE_READLINE_CFLAGS= -D_rl_echoing_p=readline_echoing_p
57	BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline
58		61
59	.include <bsd.port.options.mk>	62	.include <bsd.port.options.mk>
60		63
61	.if empty(PORT_OPTIONS:MBUNDLED_READLINE)	64	.if ! ${PORT_OPTIONS:MBUNDLED_READLINE}
62	EXCLUDE+= readline	65	EXCLUDE+= readline
63	.endif	66	.endif
64		67
Lines 67-73 Link Here
67	.endif	70	.endif
68		71
69	.if ${PORT_OPTIONS:MTHREADS}	72	.if ${PORT_OPTIONS:MTHREADS}
70	EXTRA_PATCHES= ${FILESDIR}/extrapatch-gdb-configure.tgt ${FILESDIR}/extrapatch-gdb-Makefile.in	73	EXTRA_PATCHES= ${FILESDIR}/extrapatch-gdb-configure.tgt \
		74	${FILESDIR}/extrapatch-gdb-Makefile.in
71	.endif	75	.endif
72		76
73	.if ${ARCH} == "amd64"	77	.if ${ARCH} == "amd64"
Lines 75-105 Link Here
75	.endif	79	.endif
76		80
77	post-patch:	81	post-patch:
78	@${REINPLACE_CMD} -e 's/$$/ [GDB v${PORTVERSION} for FreeBSD]/' \	82	@${REINPLACE_CMD} -e 's\|$$\| [GDB v${PORTVERSION} for FreeBSD]\|' \
79	${WRKSRC}/gdb/version.in	83	${WRKSRC}/gdb/version.in
		84
80	.if ${PORT_OPTIONS:MTHREADS}	85	.if ${PORT_OPTIONS:MTHREADS}
81	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/	86	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/
82	.endif	87	.endif
83		88
84	do-install:	89	do-install:
85	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${STAGEDIR}${PREFIX}/bin/gdb${VER}	90	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
86	${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1	91	${STAGEDIR}${PREFIX}/bin/gdb${VER}
		92	${INSTALL_MAN} ${WRKSRC}/gdb/gdb.1 \
		93	${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1
		94
87	.if ${PORT_OPTIONS:MTUI}	95	.if ${PORT_OPTIONS:MTUI}
88	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER}	96	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER}
89	.endif	97	.endif
		98
90	.if ${PORT_OPTIONS:MGDB_LINK}	99	.if ${PORT_OPTIONS:MGDB_LINK}
91	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb	100	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb
92	.endif	101	.endif
		102
93	.if ${PORT_OPTIONS:MPYTHON}	103	.if ${PORT_OPTIONS:MPYTHON}
94	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )	104	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )
95	(cd ${WRKSRC}/gdb/data-directory; ${GMAKE} DESTDIR=${STAGEDIR} install-python )	105	(cd ${WRKSRC}/gdb/data-directory ; \
		106	${GMAKE} DESTDIR=${STAGEDIR} install-python )
96	.endif	107	.endif
97		108
98	post-install:
99	.if ${PORT_OPTIONS:MPYTHON}	109	.if ${PORT_OPTIONS:MPYTHON}
100	${CHMOD} u+w ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/gdb/.py	110	. for f in gdb gdb/command gdb/function
101	${CHMOD} u+w ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/gdb/command/.py	111	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 .py )
102	${CHMOD} u+w ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/gdb/function/.py	112	. endfor
103	.endif	113	.endif
104		114
105	.include <bsd.port.mk>	115	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-sigev (+59 lines)
	1	--- gdb/common/signals.c.orig 2013-01-01 07:32:54.000000000 +0100
	2	+++ gdb/common/signals.c 2013-11-25 16:12:56.000000000 +0100
	3	@@ -46,6 +46,12 @@
	4	# endif
	5	#endif
	6
	7	+#ifdef __FreeBSD__
	8	+# ifndef SIGLIBRT
	9	+# define SIGLIBRT 33 /* Older versions do not define the constant */
	10	+# endif
	11	+#endif
	12	+
	13	/* This table must match in order and size the signals in enum
	14	gdb_signal. */
	15
	16	@@ -334,6 +340,11 @@
	17	return GDB_SIGNAL_INFO;
	18	#endif
	19
	20	+#if defined (SIGLIBRT)
	21	+ if ( hostsig == SIGLIBRT )
	22	+ return GDB_SIGNAL_FBSD_LIBRT;
	23	+#endif
	24	+
	25	#if defined (REALTIME_LO)
	26	if (hostsig >= REALTIME_LO && hostsig < REALTIME_HI)
	27	{
	28	@@ -591,6 +602,11 @@
	29	return SIGINFO;
	30	#endif
	31
	32	+#if defined (SIGLIBRT)
	33	+ case GDB_SIGNAL_FBSD_LIBRT:
	34	+ return SIGLIBRT;
	35	+#endif
	36	+
	37	default:
	38	#if defined (REALTIME_LO)
	39	retsig = 0;
	40	--- gdb/infrun.c.orig 2013-08-30 17:58:55.000000000 +0200
	41	+++ gdb/infrun.c 2013-11-22 16:12:58.000000000 +0100
	42	@@ -7291,6 +7291,8 @@
	43	signal_print[GDB_SIGNAL_WINCH] = 0;
	44	signal_stop[GDB_SIGNAL_PRIO] = 0;
	45	signal_print[GDB_SIGNAL_PRIO] = 0;
	46	+ signal_stop[GDB_SIGNAL_FBSD_LIBRT] = 0;
	47	+ signal_print[GDB_SIGNAL_FBSD_LIBRT] = 0;
	48
	49	/* These signals are used internally by user-level thread
	50	implementations. (See signal(5) on Solaris.) Like the above
	51	--- include/gdb/signals.def.orig 2013-01-01 07:41:30.000000000 +0100
	52	+++ include/gdb/signals.def 2013-11-25 16:13:42.000000000 +0100
	53	@@ -197,4 +197,5 @@
	54	/* If you are adding a new signal, add it just above this comment. */
	55
	56	/* Last and unused enum value, for sizing arrays, etc. */
	57	-SET (GDB_SIGNAL_LAST, 151, NULL, "GDB_SIGNAL_MAGIC")
	58	+SET (GDB_SIGNAL_FBSD_LIBRT, 151, "SIGLIBRT", "GDB_SIGNAL_FBSD_LIBRT")
	59	+SET (GDB_SIGNAL_LAST, 152, NULL, "GDB_SIGNAL_MAGIC")