[Midnightbsd-cvs] src [11142] trunk/contrib/bmake: fix some merge issues.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 26 20:25:50 EDT 2018 

Revision: 11142
          http://svnweb.midnightbsd.org/src/?rev=11142
Author:   laffer1
Date:     2018-06-26 20:25:49 -0400 (Tue, 26 Jun 2018)
Log Message:
-----------
fix some merge issues.

Modified Paths:
--------------
    trunk/contrib/bmake/meta.c
    trunk/contrib/bmake/mk/dirdeps.mk
    trunk/contrib/bmake/mk/meta.stage.mk
    trunk/contrib/bmake/mk/meta.sys.mk
    trunk/contrib/bmake/mk/meta2deps.py
    trunk/contrib/bmake/mk/mkopt.sh
    trunk/contrib/bmake/mk/own.mk
    trunk/contrib/bmake/unit-tests/export-env.mk
    trunk/contrib/bmake/unit-tests/modmatch.mk
    trunk/contrib/bmake/unit-tests/modts.exp
    trunk/contrib/bmake/unit-tests/modts.mk
    trunk/contrib/bmake/unit-tests/varmisc.exp
    trunk/contrib/bmake/unit-tests/varmisc.mk

Modified: trunk/contrib/bmake/meta.c
===================================================================
--- trunk/contrib/bmake/meta.c	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/meta.c	2018-06-27 00:25:49 UTC (rev 11142)
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_LIBGEN_H
-#ifdef HAVE_LIBGEN_H
 #include <libgen.h>
 #elif !defined(HAVE_DIRNAME)
 char * dirname(char *);

Modified: trunk/contrib/bmake/mk/dirdeps.mk
===================================================================
--- trunk/contrib/bmake/mk/dirdeps.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/dirdeps.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -642,11 +642,6 @@
 x!= { echo; ${DEP_EXPORT_VARS:@v at echo '$v=${$v}';@} echo '.export ${DEP_EXPORT_VARS}'; echo; } >&3; echo
 .endif
 .else
-.if ${BUILD_DIRDEPS_CACHE} == "yes"
-x!= { echo; echo '\# ${DEP_RELDIR}.${DEP_TARGET_SPEC}'; \
-	echo 'dirdeps: ${_build_dirs:${M_oneperline}}'; echo; } >&3; echo
-x!= { ${_build_dirs:@x@${target($x):?:echo '$x: _DIRDEP_USE';}@} echo; } >&3; echo
-.else
 # this makes it all happen
 dirdeps: ${_build_all_dirs}
 .endif

Modified: trunk/contrib/bmake/mk/meta.stage.mk
===================================================================
--- trunk/contrib/bmake/mk/meta.stage.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/meta.stage.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -147,7 +147,6 @@
 STAGE_TARGETS += stage_incs
 STAGE_INCS ?= ${.ALLSRC:N.dirdep:Nstage_*}
 stage_includes: stage_incs
-stage_includes: stage_incs
 stage_incs:	.dirdep
 	@${STAGE_FILE_SCRIPT}; StageFiles ${STAGE_INCSDIR:${STAGE_DIR_FILTER}} ${STAGE_INCS}
 	@touch $@

Modified: trunk/contrib/bmake/mk/meta.sys.mk
===================================================================
--- trunk/contrib/bmake/mk/meta.sys.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/meta.sys.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -102,9 +102,6 @@
 
 .endif
 
-META_COOKIE_TOUCH=
-# some targets need to be .PHONY in non-meta mode
-META_NOPHONY= .PHONY
 # Are we, after all, in meta mode?
 .if ${.MAKE.MODE:Uno:Mmeta*} != ""
 MKDEP_MK = meta.autodep.mk

Modified: trunk/contrib/bmake/mk/meta2deps.py
===================================================================
--- trunk/contrib/bmake/mk/meta2deps.py	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/meta2deps.py	2018-06-27 00:25:49 UTC (rev 11142)
@@ -399,18 +399,18 @@
         V 3
         C "pid" "cwd"
         E "pid" "path"
-	F "pid" "child"
+        F "pid" "child"
         R "pid" "path"
         W "pid" "path"
         X "pid" "status"
-	D "pid" "path"
-	L "pid" "src" "target"
-	M "pid" "old" "new"
-	S "pid" "path"
-	# Bye bye
+        D "pid" "path"
+        L "pid" "src" "target"
+        M "pid" "old" "new"
+        S "pid" "path"
+        # Bye bye
 
-	We go to some effort to avoid processing a dependency more than once.
-	Of the above record types only C,E,F,L,R,V and W are of interest.
+        We go to some effort to avoid processing a dependency more than once.
+        Of the above record types only C,E,F,L,R,V and W are of interest.
         """
 
         version = 0                     # unknown

Modified: trunk/contrib/bmake/mk/mkopt.sh
===================================================================
--- trunk/contrib/bmake/mk/mkopt.sh	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/mkopt.sh	2018-06-27 00:25:49 UTC (rev 11142)
@@ -1,5 +1,5 @@
 :
-# $Id: mkopt.sh,v 1.10 2015/06/07 17:29:08 sjg Exp $
+# $Id: mkopt.sh,v 1.11 2017/03/18 21:36:42 sjg Exp $
 #
 #	@(#) Copyright (c) 2014, Simon J. Gerraty
 #
@@ -40,7 +40,7 @@
     eval "_mov=\$$_mo _wov=\$$_wo _wiv=\$$_wi"
 
     case "$_wiv" in
-    no) _wov=no;;
+    [Nn][Oo]) _wov=no;;
     esac
     _v=${_mov:-${_wov:+no}}
     _v=${_v:-${_wiv:+yes}}

Modified: trunk/contrib/bmake/mk/own.mk
===================================================================
--- trunk/contrib/bmake/mk/own.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/mk/own.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -134,7 +134,6 @@
 $xGRP=  ${USERGRP}
 $x_INSTALL_OWN=
 .endfor
-PROG_INSTALL_OWN=
 .endif
 .endif
 

Modified: trunk/contrib/bmake/unit-tests/export-env.mk
===================================================================
--- trunk/contrib/bmake/unit-tests/export-env.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/export-env.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -1,4 +1,4 @@
-# $Id: export-env.mk,v 1.1.1.1 2014/08/30 18:57:18 sjg Exp $
+# $Id: export-env.mk,v 1.1.1.2 2016/02/18 20:35:24 sjg Exp $
 
 # our normal .export, subsequent changes affect the environment
 UT_TEST=this
@@ -15,9 +15,12 @@
 export UT_EXP=exported
 UT_EXP=not-exported
 
+UT_LIT= literal ${UT_TEST}
+.export-literal UT_LIT
+
 all:
-	@echo make:; ${UT_TEST UT_ENV UT_EXP:L:@v at echo $v=${$v};@}
-	@echo env:; ${UT_TEST UT_ENV UT_EXP:L:@v at echo $v=$${$v};@}
+	@echo make:; ${UT_TEST UT_ENV UT_EXP UT_LIT:L:@v at echo $v=${$v};@}
+	@echo env:; ${UT_TEST UT_ENV UT_EXP UT_LIT:L:@v at echo $v=$${$v};@}
 
 
 

Modified: trunk/contrib/bmake/unit-tests/modmatch.mk
===================================================================
--- trunk/contrib/bmake/unit-tests/modmatch.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/modmatch.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -15,7 +15,9 @@
 res = OK
 .endif
 
-all:
+all:	show-libs check-cclass
+
+show-libs:
 	@for x in $X; do ${.MAKE} -f ${MAKEFILE} show LIB=$$x; done
 	@echo "Mscanner=${res}"
 
@@ -23,3 +25,10 @@
 	@echo 'LIB=${LIB} X_LIBS:M$${LIB$${LIB:tu}} is "${X_LIBS:M${LIB${LIB:tu}}}"'
 	@echo 'LIB=${LIB} X_LIBS:M*/lib$${LIB}.a is "${X_LIBS:M*/lib${LIB}.a}"'
 	@echo 'LIB=${LIB} X_LIBS:M*/lib$${LIB}.a:tu is "${X_LIBS:M*/lib${LIB}.a:tu}"'
+
+LIST= One Two Three Four five six seven
+
+check-cclass:
+	@echo Upper=${LIST:M[A-Z]*}
+	@echo Lower=${LIST:M[^A-Z]*}
+	@echo nose=${LIST:M[^s]*[ex]}

Modified: trunk/contrib/bmake/unit-tests/modts.exp
===================================================================
--- trunk/contrib/bmake/unit-tests/modts.exp	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/modts.exp	2018-06-27 00:25:49 UTC (rev 11142)
@@ -23,10 +23,16 @@
 FOUR
 FIVE
 SIX"
+LIST:ts/xa:tu="ONE
+TWO
+THREE
+FOUR
+FIVE
+SIX"
 make: Bad modifier `:tx' for LIST
 LIST:tx="}"
-make: Bad modifier `:ts\x' for LIST
-LIST:ts/x:tu="\x:tu}"
+make: Bad modifier `:ts\X' for LIST
+LIST:ts/x:tu="\X:tu}"
 FU_mod-ts="a/b/cool"
 FU_mod-ts:ts:T="cool" == cool?
 B.${AAA:ts}="Baaa" == Baaa?

Modified: trunk/contrib/bmake/unit-tests/modts.mk
===================================================================
--- trunk/contrib/bmake/unit-tests/modts.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/modts.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -36,8 +36,9 @@
 	@${PRINT} 'LIST:ts/n="${LIST:ts\n}"'
 	@${PRINT} 'LIST:ts/t="${LIST:ts\t}"'
 	@${PRINT} 'LIST:ts/012:tu="${LIST:ts\012:tu}"'
+	@${PRINT} 'LIST:ts/xa:tu="${LIST:ts\xa:tu}"'
 	@${PRINT} 'LIST:tx="${LIST:tx}"'
-	@${PRINT} 'LIST:ts/x:tu="${LIST:ts\x:tu}"'
+	@${PRINT} 'LIST:ts/x:tu="${LIST:ts\X:tu}"'
 	@${PRINT} 'FU_$@="${FU_${@:ts}:ts}"'
 	@${PRINT} 'FU_$@:ts:T="${FU_${@:ts}:ts:T}" == cool?'
 	@${PRINT} 'B.$${AAA:ts}="${B.${AAA:ts}}" == Baaa?'

Modified: trunk/contrib/bmake/unit-tests/varmisc.exp
===================================================================
--- trunk/contrib/bmake/unit-tests/varmisc.exp	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/varmisc.exp	2018-06-27 00:25:49 UTC (rev 11142)
@@ -17,4 +17,9 @@
 FALSE
 do not evaluate or expand :? if discarding
 is set
+year=2016 month=04 day=01
+date=20160401
+Version=123.456.789 == 123456789
+Literal=3.4.5 == 3004005
+We have target specific vars
 exit status 0

Modified: trunk/contrib/bmake/unit-tests/varmisc.mk
===================================================================
--- trunk/contrib/bmake/unit-tests/varmisc.mk	2018-06-27 00:20:47 UTC (rev 11141)
+++ trunk/contrib/bmake/unit-tests/varmisc.mk	2018-06-27 00:25:49 UTC (rev 11142)
@@ -1,8 +1,9 @@
-# $Id: varmisc.mk,v 1.5 2015/10/12 17:10:48 sjg Exp $
+# $Id: varmisc.mk,v 1.9 2017/02/01 18:44:54 sjg Exp $
 #
 # Miscellaneous variable tests.
 
-all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none
+all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none \
+	strftime cmpv
 
 unmatched_var_paren:
 	@echo ${foo::=foo-text}
@@ -40,3 +41,22 @@
 NQ_none:
 	@echo do not evaluate or expand :? if discarding
 	@echo ${VSET:U${1:L:?${True}:${False}}}
+
+April1= 1459494000
+
+# slightly contorted syntax to use utc via variable
+strftime:
+	@echo ${year=%Y month=%m day=%d:L:gmtime=1459494000}
+	@echo date=${%Y%m%d:L:${gmtime=${April1}:L}}
+
+# big jumps to handle 3 digits per step
+M_cmpv.units = 1 1000 1000000
+M_cmpv = S,., ,g:_:range:@i at + $${_:[-$$i]} \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh
+
+Version = 123.456.789
+cmpv.only = target specific vars
+
+cmpv:
+	@echo Version=${Version} == ${Version:${M_cmpv}}
+	@echo Literal=3.4.5 == ${3.4.5:L:${M_cmpv}}
+	@echo We have ${${.TARGET:T}.only}

More information about the Midnightbsd-cvs mailing list