hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-01 00:18:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this

Browse Source 
actually reverts r250860 and r250861.

Reported by:	gjb, tinderbox
This commit is contained in:
Jung-uk Kim 2013-06-06 11:59:38 +00:00
parent 27a18d6a23
commit ee852b9c75
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/usr.bin/diff/Makefile
View File

@ -17,11 +17,10 @@ CFLAGS+=-funsigned-char
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
CFLAGS+=-D__USE_GNU
CFLAGS+=-I${.CURDIR}/../../../contrib/diff
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
CFLAGS+=-I${.CURDIR}/../../../contrib/libgnuregex
CFLAGS+=-I${DESTDIR}/usr/include/gnu
SUBDIR+=doc

3
gnu/usr.bin/grep/Makefile
View File

@ -13,8 +13,7 @@ SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
xstrtoumax.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../contrib/libgnuregex
CFLAGS+=-DHAVE_CONFIG_H -D__USE_GNU
CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
.if ${MK_BSD_GREP} != "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \

2
usr.bin/grep/Makefile
View File

@ -74,7 +74,7 @@ CFLAGS+= -DWITHOUT_BZIP2
.endif
.if !defined(WITHOUT_GNU_COMPAT)
CFLAGS+= -I/usr/include/gnu
CFLAGS+= -I${DESTDIR}/usr/include/gnu
LDADD+= -lgnuregex
DPADD+= ${LIBGNUREGEX}
.endif