Date: Sat, 19 May 2012 02:30:11 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235638 - head/lib/libmagic Message-ID: <201205190230.q4J2UB98094202@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sat May 19 02:30:10 2012 New Revision: 235638 URL: http://svn.freebsd.org/changeset/base/235638 Log: Don't depend on getline being on the build machine. That's not the case for FreeBSD 7.x machines. Modified: head/lib/libmagic/Makefile head/lib/libmagic/config.h Modified: head/lib/libmagic/Makefile ============================================================================== --- head/lib/libmagic/Makefile Sat May 19 02:08:52 2012 (r235637) +++ head/lib/libmagic/Makefile Sat May 19 02:30:10 2012 (r235638) @@ -39,8 +39,9 @@ magic.mgc: mkmagic magic CLEANFILES+= mkmagic build-tools: mkmagic -mkmagic: apprentice.c funcs.c magic.c print.c - ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +mkmagic: apprentice.c funcs.c getline.c magic.c print.c + ${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \ + -o ${.TARGET} ${.ALLSRC} FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h Modified: head/lib/libmagic/config.h ============================================================================== --- head/lib/libmagic/config.h Sat May 19 02:08:52 2012 (r235637) +++ head/lib/libmagic/config.h Sat May 19 02:30:10 2012 (r235638) @@ -39,7 +39,9 @@ #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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205190230.q4J2UB98094202>