d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the system gnuregex library vs. building GNU regex bits into libiberty

Browse Source 
and using them.

Reviewed by:	marcel,imp
Desired by:	ache
This commit is contained in:
obrien 2005-02-14 12:10:14 +00:00
parent 38b3e66d0e
commit b8e733bd9d
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/usr.bin/binutils/libiberty/Makefile
View File

@ -12,7 +12,7 @@ SRCS= argv.c concat.c choose-temp.c cp-demangle.c cp-demint.c \
xexit.c xmalloc.c xstrdup.c xstrerror.c
# The following files are needed by gdb(1)
SRCS+= regex.c splay-tree.c
SRCS+= splay-tree.c
WARNS?= 1
CFLAGS+= -DHAVE_CONFIG_H

4
gnu/usr.bin/gdb/gdb/Makefile
View File

@ -11,7 +11,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
# global symbols visible.
LDFLAGS+= -Wl,-E
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
.include <bsd.prog.mk>

4
gnu/usr.bin/gdb/gdbtui/Makefile
View File

@ -12,7 +12,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
# global symbols visible.
LDFLAGS+= -Wl,-E
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
.include <bsd.prog.mk>

4
gnu/usr.bin/gdb/kgdb/Makefile
View File

@ -8,7 +8,7 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
${OBJ_BU}/libiberty/libiberty.a
GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP}
LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -lreadline -ltermcap
DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -lreadline -ltermcap -lgnuregex
.include <bsd.prog.mk>

5
gnu/usr.bin/gdb/libgdb/Makefile
View File

@ -48,6 +48,11 @@ SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
valarith.c valops.c valprint.c values.c varobj.c \
wrapper.c ${LIBSRCS}
.for stupid_gnu in \
xregcomp xre_exec xregexec xre_search xre_compile_fastmap xregerror xre_comp xre_set_syntax
CFLAGS+= -D${stupid_gnu}=${stupid_gnu:S/^x//}
.endfor
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
_fork_child= fork-child.c
_infptrace= infptrace.c