pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/bmake/files Import bmake-20150505
details: https://anonhg.NetBSD.org/pkgsrc/rev/8bb0db4bd7c7
branches: trunk
changeset: 651977:8bb0db4bd7c7
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue May 19 21:36:43 2015 +0000
description:
Import bmake-20150505
diffstat:
devel/bmake/files/Makefile | 221 +++++++++++++++++++++++
devel/bmake/files/Makefile.config.in | 20 ++
devel/bmake/files/bsd.after-import.mk | 111 +++++++++++
devel/bmake/files/make_malloc.c | 10 +-
devel/bmake/files/makefile.in | 14 +
devel/bmake/files/meta.h | 5 +-
devel/bmake/files/realpath.c | 77 +++++---
devel/bmake/files/unit-tests/comment.exp | 5 +
devel/bmake/files/unit-tests/comment.mk | 31 +++
devel/bmake/files/unit-tests/cond1.exp | 23 ++
devel/bmake/files/unit-tests/cond1.mk | 109 +++++++++++
devel/bmake/files/unit-tests/cond2.exp | 7 +
devel/bmake/files/unit-tests/cond2.mk | 25 ++
devel/bmake/files/unit-tests/doterror.exp | 9 +
devel/bmake/files/unit-tests/doterror.mk | 20 ++
devel/bmake/files/unit-tests/dotwait.exp | 30 +++
devel/bmake/files/unit-tests/dotwait.mk | 61 ++++++
devel/bmake/files/unit-tests/error.exp | 4 +
devel/bmake/files/unit-tests/error.mk | 10 +
devel/bmake/files/unit-tests/escape.exp | 104 ++++++++++
devel/bmake/files/unit-tests/escape.mk | 246 ++++++++++++++++++++++++++
devel/bmake/files/unit-tests/export-all.exp | 12 +
devel/bmake/files/unit-tests/export-all.mk | 23 ++
devel/bmake/files/unit-tests/export-env.exp | 9 +
devel/bmake/files/unit-tests/export-env.mk | 24 ++
devel/bmake/files/unit-tests/export.exp | 6 +
devel/bmake/files/unit-tests/export.mk | 22 ++
devel/bmake/files/unit-tests/forloop.exp | 19 ++
devel/bmake/files/unit-tests/forloop.mk | 45 ++++
devel/bmake/files/unit-tests/forsubst.exp | 2 +
devel/bmake/files/unit-tests/forsubst.mk | 10 +
devel/bmake/files/unit-tests/hash.exp | 9 +
devel/bmake/files/unit-tests/hash.mk | 18 +
devel/bmake/files/unit-tests/impsrc.exp | 13 +
devel/bmake/files/unit-tests/impsrc.mk | 43 ++++
devel/bmake/files/unit-tests/misc.exp | 1 +
devel/bmake/files/unit-tests/misc.mk | 16 +
devel/bmake/files/unit-tests/moderrs.exp | 16 +
devel/bmake/files/unit-tests/moderrs.mk | 31 +++
devel/bmake/files/unit-tests/modmatch.exp | 17 +
devel/bmake/files/unit-tests/modmatch.mk | 25 ++
devel/bmake/files/unit-tests/modmisc.exp | 10 +
devel/bmake/files/unit-tests/modmisc.mk | 38 ++++
devel/bmake/files/unit-tests/modorder.exp | 11 +
devel/bmake/files/unit-tests/modorder.mk | 22 ++
devel/bmake/files/unit-tests/modts.exp | 33 +++
devel/bmake/files/unit-tests/modts.mk | 43 ++++
devel/bmake/files/unit-tests/modword.exp | 122 ++++++++++++
devel/bmake/files/unit-tests/modword.mk | 151 +++++++++++++++
devel/bmake/files/unit-tests/order.exp | 4 +
devel/bmake/files/unit-tests/order.mk | 20 ++
devel/bmake/files/unit-tests/phony-end.exp | 6 +
devel/bmake/files/unit-tests/phony-end.mk | 9 +
devel/bmake/files/unit-tests/posix.exp | 23 ++
devel/bmake/files/unit-tests/posix.mk | 24 ++
devel/bmake/files/unit-tests/posix1.exp | 185 +++++++++++++++++++
devel/bmake/files/unit-tests/posix1.mk | 184 +++++++++++++++++++
devel/bmake/files/unit-tests/qequals.exp | 2 +
devel/bmake/files/unit-tests/qequals.mk | 8 +
devel/bmake/files/unit-tests/suffixes.exp | 35 +++
devel/bmake/files/unit-tests/suffixes.mk | 89 +++++++++
devel/bmake/files/unit-tests/sunshcmd.exp | 4 +
devel/bmake/files/unit-tests/sunshcmd.mk | 10 +
devel/bmake/files/unit-tests/sysv.exp | 7 +
devel/bmake/files/unit-tests/sysv.mk | 26 ++
devel/bmake/files/unit-tests/ternary.exp | 10 +
devel/bmake/files/unit-tests/ternary.mk | 8 +
devel/bmake/files/unit-tests/unexport-env.exp | 2 +
devel/bmake/files/unit-tests/unexport-env.mk | 14 +
devel/bmake/files/unit-tests/unexport.exp | 4 +
devel/bmake/files/unit-tests/unexport.mk | 8 +
devel/bmake/files/unit-tests/varcmd.exp | 9 +
devel/bmake/files/unit-tests/varcmd.mk | 49 +++++
devel/bmake/files/unit-tests/varmisc.exp | 2 +
devel/bmake/files/unit-tests/varmisc.mk | 8 +
devel/bmake/files/unit-tests/varshell.exp | 10 +
devel/bmake/files/unit-tests/varshell.mk | 19 ++
77 files changed, 2676 insertions(+), 36 deletions(-)
diffs (truncated from 3157 to 300 lines):
diff -r 2b7ae7470243 -r 8bb0db4bd7c7 devel/bmake/files/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bmake/files/Makefile Tue May 19 21:36:43 2015 +0000
@@ -0,0 +1,221 @@
+# $Id: Makefile,v 1.1.1.1 2015/05/19 21:36:43 joerg Exp $
+
+# Base version on src date
+MAKE_VERSION= 20150505
+
+PROG= bmake
+
+SRCS= \
+ arch.c \
+ buf.c \
+ compat.c \
+ cond.c \
+ dir.c \
+ for.c \
+ hash.c \
+ job.c \
+ main.c \
+ make.c \
+ make_malloc.c \
+ meta.c \
+ parse.c \
+ str.c \
+ strlist.c \
+ suff.c \
+ targ.c \
+ trace.c \
+ util.c \
+ var.c
+
+# from lst.lib/
+SRCS+= \
+ lstAppend.c \
+ lstAtEnd.c \
+ lstAtFront.c \
+ lstClose.c \
+ lstConcat.c \
+ lstDatum.c \
+ lstDeQueue.c \
+ lstDestroy.c \
+ lstDupl.c \
+ lstEnQueue.c \
+ lstFind.c \
+ lstFindFrom.c \
+ lstFirst.c \
+ lstForEach.c \
+ lstForEachFrom.c \
+ lstInit.c \
+ lstInsert.c \
+ lstIsAtEnd.c \
+ lstIsEmpty.c \
+ lstLast.c \
+ lstMember.c \
+ lstNext.c \
+ lstOpen.c \
+ lstPrev.c \
+ lstRemove.c \
+ lstReplace.c \
+ lstSucc.c
+
+# this file gets generated by configure
+.-include "Makefile.config"
+
+.if !empty(LIBOBJS)
+SRCS+= ${LIBOBJS:T:.o=.c}
+.endif
+
+# just in case
+prefix?= /usr
+srcdir?= ${.CURDIR}
+
+DEFAULT_SYS_PATH?= ${prefix}/share/mk
+
+CPPFLAGS+= -DUSE_META
+CFLAGS+= ${CPPFLAGS}
+CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
+CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE
+CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
+COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
+
+# meta mode can be useful even without filemon
+FILEMON_H ?= /usr/include/dev/filemon/filemon.h
+.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h"
+COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
+.endif
+
+.PATH: ${srcdir}
+.PATH: ${srcdir}/lst.lib
+
+.if make(obj) || make(clean)
+SUBDIR+= unit-tests
+.endif
+
+# start-delete1 for bsd.after-import.mk
+# we skip a lot of this when building as part of FreeBSD etc.
+
+# list of OS's which are derrived from BSD4.4
+BSD44_LIST= NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig
+# we are...
+OS!= uname -s
+# are we 4.4BSD ?
+isBSD44:=${BSD44_LIST:M${OS}}
+
+.if ${isBSD44} == ""
+MANTARGET= cat
+INSTALL?=${srcdir}/install-sh
+.if (${MACHINE} == "sun386")
+# even I don't have one of these anymore :-)
+CFLAGS+= -DPORTAR
+.elif (${MACHINE} != "sunos")
+SRCS+= sigcompat.c
+CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
+.endif
+.else
+MANTARGET?= man
+.endif
+
+# turn this on by default - ignored if we are root
+WITH_INSTALL_AS_USER=
+
+# suppress with -DWITHOUT_*
+OPTIONS_DEFAULT_YES+= \
+ AUTOCONF_MK \
+ INSTALL_MK \
+ PROG_LINK
+
+OPTIONS_DEFAULT_NO+= \
+ PROG_VERSION
+
+# process options now
+.include <own.mk>
+
+.if ${MK_PROG_VERSION} == "yes"
+PROG_NAME= ${PROG}-${MAKE_VERSION}
+.if ${MK_PROG_LINK} == "yes"
+SYMLINKS+= ${PROG}-${MAKE_VERSION} ${BINDIR}/${PROG}
+.endif
+.endif
+
+EXTRACT_MAN=no
+# end-delete1
+
+MAN= ${PROG}.1
+MAN1= ${MAN}
+
+.if (${PROG} != "make")
+CLEANFILES+= my.history
+.if make(${MAN}) || !exists(${srcdir}/${MAN})
+my.history: ${MAKEFILE}
+ @(echo ".Nm"; \
+ echo "is derived from NetBSD"; \
+ echo ".Xr make 1 ."; \
+ echo "It uses autoconf to facilitate portability to other platforms."; \
+ echo ".Pp") > $@
+
+.NOPATH: ${MAN}
+${MAN}: make.1 my.history
+ @echo making $@
+ @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
+ -e '/^.Sh HISTORY/rmy.history' \
+ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@
+
+all beforeinstall: ${MAN}
+_mfromdir=.
+.endif
+.endif
+
+MANTARGET?= cat
+MANDEST?= ${MANDIR}/${MANTARGET}1
+
+.if ${MANTARGET} == "cat"
+_mfromdir=${srcdir}
+.endif
+
+.include <prog.mk>
+
+CPPFLAGS+= -DMAKE_NATIVE -DHAVE_CONFIG_H
+COPTS.var.c += -Wno-cast-qual
+COPTS.job.c += -Wno-format-nonliteral
+COPTS.parse.c += -Wno-format-nonliteral
+COPTS.var.c += -Wno-format-nonliteral
+
+# Force these
+SHAREDIR= ${SHAREDIR.bmake:U${prefix}/share}
+BINDIR= ${BINDIR.bmake:U${prefix}/bin}
+MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man}
+
+.if !exists(.depend)
+${OBJS}: config.h
+.endif
+
+# make sure that MAKE_VERSION gets updated.
+main.o: ${SRCS} ${MAKEFILE}
+
+# start-delete2 for bsd.after-import.mk
+.if ${MK_AUTOCONF_MK} == "yes"
+.include <autoconf.mk>
+.endif
+SHARE_MK?=${SHAREDIR}/mk
+MKSRC=${srcdir}/mk
+INSTALL?=${srcdir}/install-sh
+
+.if ${MK_INSTALL_MK} == "yes"
+install: install-mk
+.endif
+
+beforeinstall:
+ test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m 775 -d ${DESTDIR}${BINDIR}
+ test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m 775 -d ${DESTDIR}${MANDEST}
+
+install-mk:
+.if exists(${MKSRC}/install-mk)
+ test -d ${DESTDIR}${SHARE_MK} || ${INSTALL} -m 775 -d ${DESTDIR}${SHARE_MK}
+ sh ${MKSRC}/install-mk -v -m 644 ${DESTDIR}${SHARE_MK}
+.else
+ @echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false
+.endif
+# end-delete2
+
+# A simple unit-test driver to help catch regressions
+accept test:
+ cd ${.CURDIR}/unit-tests && MAKEFLAGS= ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
diff -r 2b7ae7470243 -r 8bb0db4bd7c7 devel/bmake/files/Makefile.config.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bmake/files/Makefile.config.in Tue May 19 21:36:43 2015 +0000
@@ -0,0 +1,20 @@
+# things set by configure
+
+prefix= @prefix@
+srcdir= @srcdir@
+CC?= @CC@
+MACHINE= @machine@
+MACHINE_ARCH= @machine_arch@
+DEFAULT_SYS_PATH= @default_sys_path@
+
+CPPFLAGS+= @CPPFLAGS@
+CFLAGS+= ${CPPFLAGS} @DEFS@
+LDFLAGS= @LDFLAGS@
+LIBOBJS= @LIBOBJS@
+LDADD= @LIBS@
+USE_META= @use_meta@
+FILEMON_H= @filemon_h@
+BMAKE_PATH_MAX?= @bmake_path_max@
+# used if MAXPATHLEN not defined
+CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
+
diff -r 2b7ae7470243 -r 8bb0db4bd7c7 devel/bmake/files/bsd.after-import.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/bmake/files/bsd.after-import.mk Tue May 19 21:36:43 2015 +0000
@@ -0,0 +1,111 @@
+# $Id: bsd.after-import.mk,v 1.1.1.1 2015/05/19 21:36:43 joerg Exp $
+
+# This makefile is for use when integrating bmake into a BSD build
+# system. Use this makefile after importing bmake.
+# It will bootstrap the new version,
+# capture the generated files we need, and add an after-import
+# target to allow the process to be easily repeated.
+
+# The goal is to allow the benefits of autoconf without
+# the overhead of running configure.
+
+all: _makefile
+all: after-import
+
+# we rely on bmake
+.if !defined(.PARSEDIR)
+.error this makefile requires bmake
+.endif
+
+_this := ${MAKEFILE:tA}
+BMAKE_SRC := ${.PARSEDIR}
+
+# it helps to know where the top of the tree is.
+.if !defined(SRCTOP)
+srctop := ${.MAKE.MAKEFILES:M*src/share/mk/sys.mk:H:H:H}
+.if empty(srctop)
+# likely locations?
+.for d in contrib/bmake external/bsd/bmake/dist
+.if ${BMAKE_SRC:M*/$d} != ""
+srctop := ${BMAKE_SRC:tA:S,/$d,,}
+.endif
+.endfor
+.endif
+.if !empty(srctop)
+SRCTOP := ${srctop}
+.endif
+.endif
+
+# This lets us match what boot-strap does
+.if !defined(HOST_OS)
+HOST_OS!= uname
+.endif
+
+BOOTSTRAP_ARGS = \
+ --prefix /usr \
+ --share /usr/share
+
Home |
Main Index |
Thread Index |
Old Index