Author: obrien
Date: Tue Sep 11 22:38:33 2012
New Revision: 240377
URL: http://svn.freebsd.org/changeset/base/240377
Log:
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.
Modified:
head/lib/libmagic/Makefile
head/lib/libmagic/config.h
head/tools/build/Makefile
Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile Tue Sep 11 22:13:37 2012 (r240376)
+++ head/lib/libmagic/Makefile Tue Sep 11 22:38:33 2012 (r240377)
@@ -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
Modified: head/lib/libmagic/config.h
==============================================================================
--- head/lib/libmagic/config.h Tue Sep 11 22:13:37 2012 (r240376)
+++ head/lib/libmagic/config.h Tue Sep 11 22:38:33 2012 (r240377)
@@ -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
Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile Tue Sep 11 22:13:37 2012 (r240376)
+++ head/tools/build/Makefile Tue Sep 11 22:38:33 2012 (r240377)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
