diff options
| author | obrien <obrien@FreeBSD.org> | 2012-09-11 22:38:33 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2012-09-11 22:38:33 +0000 |
| commit | 7b9a39e571e34d69700525b7529ad7961aee4341 (patch) | |
| tree | 6dca9cd819c40cc5e97d69acbd873c02e2fd25fe /lib/libmagic | |
| parent | 0efafa1fad361ad81136f211821bbe8f975755cc (diff) | |
| download | FreeBSD-src-7b9a39e571e34d69700525b7529ad7961aee4341.zip FreeBSD-src-7b9a39e571e34d69700525b7529ad7961aee4341.tar.gz | |
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.
Diffstat (limited to 'lib/libmagic')
| -rw-r--r-- | lib/libmagic/Makefile | 6 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index d983813..d341a3a 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -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 diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index c17883f..c7e38ec 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -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 |
