diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2018-03-02 01:53:50 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2018-03-02 01:53:50 +0000 |
| commit | 50d2e745fa6eaec4ff8fc4112b6b86ba2e27ffe3 (patch) | |
| tree | 39927e8ec0416dfc3ca3169c4ec1cdaed7bb3d59 /usr.bin | |
| parent | 35e313cfe89a211b9e989f17361b216b39150002 (diff) | |
| parent | 2358deb6549648fd9a27a65544f9944b312426c2 (diff) | |
Notes
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile.config | 6 | ||||
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 4 | ||||
| -rw-r--r-- | usr.bin/bmake/config.h | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 93e16cbae3979..77d1cd1da5201 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,11 +7,11 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION=20171028 +_MAKE_VERSION=20180222 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake -CC?= gcc +CC?= cc DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk CPPFLAGS+= @@ -20,7 +20,7 @@ LDFLAGS= LIBOBJS= ${LIBOBJDIR}stresep$U.o LDADD= USE_META= yes -FILEMON_H= /usr/include/dev/filemon/filemon.h +FILEMON_H?= /usr/include/dev/filemon/filemon.h BMAKE_PATH_MAX?= 1024 # used if MAXPATHLEN not defined CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 918a3ab335ebd..3cd2872f1530d 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -30,3 +30,7 @@ CFLAGS+= -DNO_PWD_OVERRIDE DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk .export DEFAULT_SYS_PATH .endif + +.if ${MACHINE} != "host" +FILEMON_H ?= ${SRCTOP}/sys/dev/filemon/filemon.h +.endif diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h index 16e043e683d8b..ee554167a3cff 100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@ -236,7 +236,7 @@ #define HAVE_WORKING_VFORK 1 /* define if your compiler has __attribute__ */ -/* #undef HAVE___ATTRIBUTE__ */ +#define HAVE___ATTRIBUTE__ 1 /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "sjg@NetBSD.org" @@ -245,7 +245,7 @@ #define PACKAGE_NAME "bmake" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "bmake 20170812" +#define PACKAGE_STRING "bmake 20171126" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "bmake" @@ -254,7 +254,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "20170812" +#define PACKAGE_VERSION "20171126" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void |