Really allow building on 4.x. Rev 1.40 was a NOP as the base readline lib
(libreadline.so.4) was the same name as the ports's library. So Rev 1.40 only worked if you manually installed the readline port. This fix allows gdb6 to build with the base stock readline.
This commit is contained in:
parent
ce795f59a7
commit
eb0476c2dd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=120333
@ -35,9 +35,7 @@ CFLAGS+= -DRL_NO_COMPAT -DKGDB
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
USE_GCC?= 3.4
|
||||
LIB_DEPENDS= readline.4:${PORTSDIR}/devel/readline
|
||||
CFLAGS+= -Wl,--rpath -Wl,${PREFIX}/lib
|
||||
CFLAGS+= -include ${FILESDIR}/fbsd4.h
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == "amd64"
|
||||
|
15
devel/gdb6/files/fbsd4.h
Normal file
15
devel/gdb6/files/fbsd4.h
Normal file
@ -0,0 +1,15 @@
|
||||
// $FreeBSD$
|
||||
|
||||
extern void _rl_set_screen_size (int, int);
|
||||
|
||||
#define rl_set_screen_size _rl_set_screen_size
|
||||
#define rl_filename_completion_function filename_completion_function
|
||||
|
||||
extern int screenwidth, screenheight;
|
||||
|
||||
static inline void
|
||||
rl_get_screen_size (int *rows, int *cols)
|
||||
{
|
||||
if (rows) *rows = screenheight;
|
||||
if (cols) *cols = screenwidth;
|
||||
}
|
@ -35,9 +35,7 @@ CFLAGS+= -DRL_NO_COMPAT -DKGDB
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} < 500000
|
||||
USE_GCC?= 3.4
|
||||
LIB_DEPENDS= readline.4:${PORTSDIR}/devel/readline
|
||||
CFLAGS+= -Wl,--rpath -Wl,${PREFIX}/lib
|
||||
CFLAGS+= -include ${FILESDIR}/fbsd4.h
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == "amd64"
|
||||
|
15
devel/gdb66/files/fbsd4.h
Normal file
15
devel/gdb66/files/fbsd4.h
Normal file
@ -0,0 +1,15 @@
|
||||
// $FreeBSD$
|
||||
|
||||
extern void _rl_set_screen_size (int, int);
|
||||
|
||||
#define rl_set_screen_size _rl_set_screen_size
|
||||
#define rl_filename_completion_function filename_completion_function
|
||||
|
||||
extern int screenwidth, screenheight;
|
||||
|
||||
static inline void
|
||||
rl_get_screen_size (int *rows, int *cols)
|
||||
{
|
||||
if (rows) *rows = screenheight;
|
||||
if (cols) *cols = screenwidth;
|
||||
}
|
Loading…
Reference in New Issue
Block a user