r235638 is not the clean way to add support for building on ancient FreeBSD

versions.  Instead use Imp's good work on "legacy" and follow the outcome
of the previous TRB discussions on this topic.

Now use the libc getline() if it exists, and only where it doesn't
create a bootstraping version.
This commit is contained in:
David E. O'Brien 2012-09-11 22:38:33 +00:00
parent 08bfef24af
commit c2774610af
3 changed files with 17 additions and 7 deletions

View File

@ -39,9 +39,9 @@ magic.mgc: mkmagic magic
CLEANFILES+= mkmagic
build-tools: mkmagic
mkmagic: apprentice.c encoding.c funcs.c getline.c magic.c print.c
${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \
-o ${.TARGET} ${.ALLSRC}
mkmagic: apprentice.c encoding.c funcs.c magic.c print.c
${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
${LDADD}
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
${.CURDIR}/config.h

View File

@ -39,9 +39,7 @@
#define HAVE_FSEEKO 1
/* Define to 1 if you have the `getline' function. */
#ifndef HOSTPROG
#define HAVE_GETLINE 1
#endif
/* Define to 1 if you have the <getopt.h> header file. */
#define HAVE_GETOPT_H 1

View File

@ -3,12 +3,24 @@
.PATH: ${.CURDIR}/../../include
LIB= egacy
SRCS=
SRC=
INCSGROUPS= INCS
INCS=
INCS=
BOOTSTRAPPING?= 0
_WITH_GETLINE!= grep -c _WITH_GETLINE /usr/include/stdio.h || true
.if ${_WITH_GETLINE} == 0
.PATH: ${.CURDIR}/../../contrib/file ${.CURDIR}/../../lib/libmagic
SRCS= getline.c config.h
CFLAGS+= -DHAVE_CONFIG_H -I.
CLEANFILES+= config.h
${SRCS:N*.h:R:S/$/.o/}: config.h
config.h: ${.CURDIR}/../../lib/libmagic/config.h
grep -v HAVE_GETLINE ${.ALLSRC} > ${.TARGET}
.endif
.if empty(SRCS)
SRCS= dummy.c
.endif