Re: pkg/42850 (Haiku OS support for devel/bmake)

["Simon J. Gerraty" <sjg%juniper.net@localhost>]

The following reply was made to PR pkg/42850; it has been noted by GNATS.

From: "Simon J. Gerraty" <sjg%juniper.net@localhost>
To: <gnats-bugs%NetBSD.org@localhost>
Cc: gnats-admin%NetBSD.org@localhost, pkgsrc-bugs%NetBSD.org@localhost, 
obata%lins.jp@localhost
Subject: Re: pkg/42850 (Haiku OS support for devel/bmake) 
Date: Thu, 22 Apr 2010 10:36:42 -0700

 FWIW I just confirmed that with a minor teak, we can run the unit-tests
 without any *.mk.  This is my current patch for this PR:
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.bin/make/Makefile,v
 retrieving revision 1.49
 diff -u -p -r1.49 Makefile
 --- Makefile   14 Apr 2009 22:15:23 -0000      1.49
 +++ Makefile   22 Apr 2010 16:46:09 -0000
 @@ -37,4 +37,4 @@ DPADD+=${LIBUTIL}
  
  # A simple unit-test driver to help catch regressions
  accept test:
 -      cd ${.CURDIR}/unit-tests && ${.MAKE:S,^./,${.CURDIR}/,} 
TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
 +      cd ${.CURDIR}/unit-tests && ${.MAKE} -r -m / 
TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET}
 Index: unit-tests/Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.bin/make/unit-tests/Makefile,v
 retrieving revision 1.26
 diff -u -p -r1.26 Makefile
 --- unit-tests/Makefile        8 Apr 2010 17:41:29 -0000       1.26
 +++ unit-tests/Makefile        22 Apr 2010 16:46:09 -0000
 @@ -53,9 +53,10 @@ ${SUBFILES}:
  clean:
        rm -f *.out *.fail *.core
  
 -.include <bsd.obj.mk>
 +.-include <bsd.obj.mk>
  
  TEST_MAKE?= ${.MAKE}
 +TOOL_SED?= sed
  
  # The driver.
  # We always pretend .MAKE was called 'make' 
 Index: unit-tests/modmisc
 ===================================================================
 RCS file: /cvsroot/src/usr.bin/make/unit-tests/modmisc,v
 retrieving revision 1.4
 diff -u -p -r1.4 modmisc
 --- unit-tests/modmisc 11 May 2006 15:37:07 -0000      1.4
 +++ unit-tests/modmisc 22 Apr 2010 16:46:09 -0000
 @@ -2,7 +2,7 @@
  #
  # miscellaneous modifier tests
  
 -path=:/bin:/usr/bin::/sbin:/usr/sbin:.:/home/user/bin:.
 +path=:/bin:/usr/bin::/:.:/user/bin:.
  # strip cwd from path.
  MOD_NODOT=S/:/ /g:N.:ts:
  # and decorate, note that $'s need to be doubled. Also note that 
 Index: unit-tests/test.exp
 ===================================================================
 RCS file: /cvsroot/src/usr.bin/make/unit-tests/test.exp,v
 retrieving revision 1.32
 diff -u -p -r1.32 test.exp
 --- unit-tests/test.exp        21 Apr 2010 04:25:28 -0000      1.32
 +++ unit-tests/test.exp        22 Apr 2010 16:46:09 -0000
 @@ -112,14 +112,14 @@ LIB=e X_LIBS:M${LIB${LIB:tu}} is "/tmp/l
  LIB=e X_LIBS:M*/lib${LIB}.a is "/tmp/libe.a"
  LIB=e X_LIBS:M*/lib${LIB}.a:tu is "/TMP/LIBE.A"
  Mscanner=OK
 -path=':/bin:/usr/bin::/sbin:/usr/sbin:.:/home/user/bin:.'
 -path='/bin:/usr/bin:/sbin:/usr/sbin:/home/user/bin'
 -path='/bin:/usr/bin:/sbin:/usr/sbin:/homes/user/bin'
 -path='/bin':'/usr/bin':'/sbin':'/usr/sbin':'/home/user/bin'
 -path='/bin':'/usr/bin':'/sbin':'/usr/sbin':'/homes/user/bin'
 +path=':/bin:/usr/bin::/:.:/user/bin:.'
 +path='/bin:/usr/bin:/:/user/bin'
 +path='/bin:/usr/bin:/:/user/bin'
 +path='/bin':'/usr/bin':'/':'/user/bin'
 +path='/bin':'/usr/bin':'/':'/user/bin'
  path_/usr/xbin=/opt/xbin/
 -paths=/bin /usr/bin /sbin /usr/sbin /homes/user/bin /opt/xbin
 -PATHS=/BIN /USR/BIN /SBIN /USR/SBIN /HOMES/USER/BIN /OPT/XBIN
 +paths=/bin /usr/bin / /user/bin /opt/xbin
 +PATHS=/BIN /USR/BIN / /USER/BIN /OPT/XBIN
  LIST      = one two three four five six seven eight nine ten
  LIST:O    = eight five four nine one seven six ten three two
  LIST:Ox   = Ok