diff options
author | obrien <obrien@FreeBSD.org> | 2005-02-14 12:10:14 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2005-02-14 12:10:14 +0000 |
commit | b8e733bd9d8dbd0de4b30f7dd32cd624d2dd96a6 (patch) | |
tree | 268a33a6a1fb74a2a2405faae83ee380de6c1f0a /gnu/usr.bin | |
parent | 38b3e66d0e482dcdfa25e3a105ecf1953564ffcc (diff) | |
download | FreeBSD-src-b8e733bd9d8dbd0de4b30f7dd32cd624d2dd96a6.zip FreeBSD-src-b8e733bd9d8dbd0de4b30f7dd32cd624d2dd96a6.tar.gz |
Use the system gnuregex library vs. building GNU regex bits into libiberty
and using them.
Reviewed by: marcel,imp
Desired by: ache
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r-- | gnu/usr.bin/binutils/libiberty/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/gdb/gdb/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gdb/gdbtui/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gdb/kgdb/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/gdb/libgdb/Makefile | 5 |
5 files changed, 12 insertions, 7 deletions
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile index 37895aa..292d1fc 100644 --- a/gnu/usr.bin/binutils/libiberty/Makefile +++ b/gnu/usr.bin/binutils/libiberty/Makefile @@ -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 diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index b4ca070..ef9e135 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -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> diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index 02efc67..4a01eae 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -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> diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile index 4eb14421..404b960 100644 --- a/gnu/usr.bin/gdb/kgdb/Makefile +++ b/gnu/usr.bin/gdb/kgdb/Makefile @@ -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> diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile index 0a7fad6..e9e92ca 100644 --- a/gnu/usr.bin/gdb/libgdb/Makefile +++ b/gnu/usr.bin/gdb/libgdb/Makefile @@ -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 |