pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap script uses source files from pkgs...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7a663b3c89b
branches:  trunk
changeset: 501966:d7a663b3c89b
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Nov 01 01:06:02 2005 +0000

description:
bootstrap script uses source files from pkgsrc/devel/bmake/files
for "bmake".

Remove all of bmake source from this bootstrap.
Keep bootstrap/bmake/mk -- copy to files-mk (so the
bmake "boot-strap" doesn't notice the mk*).

This was tested on DragonFly, NetBSD and some on Linux.

Hopefully all the fixes to boostrap's bmake are included in
devel/bmake/files.

Note that the "mk" files is still not using devel/mk-files.

diffstat:

 bootstrap/bmake/ChangeLog                |   219 -
 bootstrap/bmake/FILES                    |    83 -
 bootstrap/bmake/Makefile.in              |   118 -
 bootstrap/bmake/PSD.doc/Makefile         |     8 -
 bootstrap/bmake/PSD.doc/tutorial.ms      |  3744 ------------------------------
 bootstrap/bmake/README                   |   110 -
 bootstrap/bmake/aclocal.m4               |    77 -
 bootstrap/bmake/arch.c                   |  1344 ----------
 bootstrap/bmake/bit.h                    |   102 -
 bootstrap/bmake/buf.c                    |   308 --
 bootstrap/bmake/buf.h                    |    79 -
 bootstrap/bmake/compat.c                 |   636 -----
 bootstrap/bmake/cond.c                   |  1351 ----------
 bootstrap/bmake/config.h.in              |   182 -
 bootstrap/bmake/configure                |  2966 -----------------------
 bootstrap/bmake/configure.in             |   210 -
 bootstrap/bmake/dir.c                    |  1470 -----------
 bootstrap/bmake/dir.h                    |    72 -
 bootstrap/bmake/find_lib.sh              |    13 -
 bootstrap/bmake/for.c                    |   390 ---
 bootstrap/bmake/getenv.c                 |    90 -
 bootstrap/bmake/getopt.c                 |   179 -
 bootstrap/bmake/hash.c                   |   429 ---
 bootstrap/bmake/hash.h                   |   118 -
 bootstrap/bmake/install-sh               |   201 -
 bootstrap/bmake/job.c                    |  3483 ---------------------------
 bootstrap/bmake/job.h                    |   265 --
 bootstrap/bmake/list.h                   |   300 --
 bootstrap/bmake/lst.h                    |   166 -
 bootstrap/bmake/lst.lib/Makefile         |    10 -
 bootstrap/bmake/lst.lib/lstAppend.c      |   124 -
 bootstrap/bmake/lst.lib/lstAtEnd.c       |    81 -
 bootstrap/bmake/lst.lib/lstAtFront.c     |    82 -
 bootstrap/bmake/lst.lib/lstClose.c       |    88 -
 bootstrap/bmake/lst.lib/lstConcat.c      |   187 -
 bootstrap/bmake/lst.lib/lstDatum.c       |    82 -
 bootstrap/bmake/lst.lib/lstDeQueue.c     |    92 -
 bootstrap/bmake/lst.lib/lstDestroy.c     |   113 -
 bootstrap/bmake/lst.lib/lstDupl.c        |   110 -
 bootstrap/bmake/lst.lib/lstEnQueue.c     |    84 -
 bootstrap/bmake/lst.lib/lstFind.c        |    81 -
 bootstrap/bmake/lst.lib/lstFindFrom.c    |   105 -
 bootstrap/bmake/lst.lib/lstFirst.c       |    82 -
 bootstrap/bmake/lst.lib/lstForEach.c     |    83 -
 bootstrap/bmake/lst.lib/lstForEachFrom.c |   123 -
 bootstrap/bmake/lst.lib/lstInit.c        |    87 -
 bootstrap/bmake/lst.lib/lstInsert.c      |   124 -
 bootstrap/bmake/lst.lib/lstInt.h         |   113 -
 bootstrap/bmake/lst.lib/lstIsAtEnd.c     |    92 -
 bootstrap/bmake/lst.lib/lstIsEmpty.c     |    80 -
 bootstrap/bmake/lst.lib/lstLast.c        |    82 -
 bootstrap/bmake/lst.lib/lstMember.c      |    80 -
 bootstrap/bmake/lst.lib/lstNext.c        |   125 -
 bootstrap/bmake/lst.lib/lstOpen.c        |    92 -
 bootstrap/bmake/lst.lib/lstRemove.c      |   142 -
 bootstrap/bmake/lst.lib/lstReplace.c     |    84 -
 bootstrap/bmake/lst.lib/lstSucc.c        |    84 -
 bootstrap/bmake/lst.lib/makefile.boot.in |    45 -
 bootstrap/bmake/machine.sh               |    85 -
 bootstrap/bmake/main.c                   |  1795 --------------
 bootstrap/bmake/make-conf.h              |   133 -
 bootstrap/bmake/make.1                   |  1265 ----------
 bootstrap/bmake/make.c                   |  1107 --------
 bootstrap/bmake/make.h                   |   438 ---
 bootstrap/bmake/makefile.boot.in         |    60 -
 bootstrap/bmake/missing/sys/cdefs.h      |   176 -
 bootstrap/bmake/mkdeps.sh                |   322 --
 bootstrap/bmake/nonints.h                |   154 -
 bootstrap/bmake/parse.c                  |  2825 ----------------------
 bootstrap/bmake/pathnames.h              |    52 -
 bootstrap/bmake/ranlib.h                 |    30 -
 bootstrap/bmake/setenv.c                 |   154 -
 bootstrap/bmake/sigcompat.c              |   334 --
 bootstrap/bmake/sprite.h                 |   113 -
 bootstrap/bmake/str.c                    |   472 ---
 bootstrap/bmake/suff.c                   |  2544 --------------------
 bootstrap/bmake/targ.c                   |   726 -----
 bootstrap/bmake/trace.c                  |   125 -
 bootstrap/bmake/trace.h                  |    56 -
 bootstrap/bmake/util.c                   |   506 ----
 bootstrap/bmake/var.c                    |  2928 -----------------------
 bootstrap/bmake/wait.h                   |    81 -
 bootstrap/bootstrap                      |    15 +-
 83 files changed, 9 insertions(+), 37957 deletions(-)

diffs (truncated from 38329 to 300 lines):

diff -r d5fa0a3de4bb -r d7a663b3c89b bootstrap/bmake/ChangeLog
--- a/bootstrap/bmake/ChangeLog Tue Nov 01 01:05:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-Tue Oct 16 12:18:42 2001  Simon J. Gerraty  <sjg%zen.crufty.net@localhost>
-
-       * Merge with NetBSD make
-       pick up fix for .END failure in compat mode.
-       pick up fix for extra va_end() in ParseVErrorInternal.
-
-Thu Oct 11 13:20:06 2001  Simon J. Gerraty  <sjg%zen.crufty.net@localhost>
-
-       * configure.in: for systems that have sys/cdefs.h check if it is
-       compatible.  If not, include the one under missing, but tell it to
-       include the native one too - necessary on Linux.
-
-       * missing/sys/cdefs.h: if NEED_HOST_CDEFS_H is defined, use
-       include_next (for gcc) to get the native sys/cdefs.h
-
-Tue Aug 21 02:29:34 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * job.c (JobFinish): Fix an earlier merge bug that resulted in
-       leaking descriptors when using -jN.
-       
-       * job.c (JobPrintCommand): See if "curdir" exists before
-       attempting to chdir().  Doing the chdir directly in make (when in
-       compat mode) fails silently, so let the -jN version do the same.
-       This can happen when building kernels in an object tree and
-       playing clever games to reset .CURDIR.
-
-       * Merged with NetBSD make
-       pick up .USEBEFORE
-
-Tue Jun 26 23:45:11 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * makefile.boot.in: Give bmake.boot a MAKESYSPATH that might work.
-
-Tue Jun 12 16:48:57 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * var.c (Var_Set): Add 4th (flags) arg so VarLoopExpand can tell
-       us not to export the iterator variable when using VAR_CMD context.
-
-Sun Jun 10 21:55:21 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * job.c (Job_CatchChildren): don't call Job_CatchOutput() here,
-       its the wrong "fix".
-
-Sat Jun  9 00:11:24 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Redesigned export of VAR_CMD's via MAKEFLAGS.
-       We now simply append the variable names to .MAKEOVERRIDES, and
-       handle duplicate suppression and quoting in ExportMAKEFLAGS using:
-       ${.MAKEOVERRIDES:O:u:@v@$v=${$v:Q}@}
-       Apart from fixing quoting bugs in previous version, this allows us
-       to export vars to the environment by simply doing:
-       .MAKEOVERRIDES+= PATH 
-       Merged again with NetBSD make, but the above is the only change.
-
-       * configure.in: added
-       --disable-pwd-override          disable $PWD overriding getcwd()
-       --disable-check-make-chdir      disable make trying to guess 
-               when it should automatically cd ${.CURDIR}
-
-       * Merge with NetBSD make, changes include:
-       parse.c (ParseDoDependency): Spot that the syntax error is
-       caused by an unresolved cvs/rcs conflict and say so.
-       var.c: most of Var* functions now take a ctxt as 1st arg.
-       now does variable substituion on rhs of sysv style modifiers.
-       
-       * var.c (Var_Set): exporting of command line variables (VAR_CMD)
-       is now done here.  We append the name='value' to .MAKEOVERRIDES
-       rather than directly into MAKEFLAGS as this allows a Makefile to
-       use .MAKEOVERRIDES= to disable this behaviour.  GNU make uses a
-       very similar mechanism.  Note that in adding name='value' to
-       .MAKEOVERRIDES we do the moral equivalent of:
-       .MAKEOVERRIDES:= ${.MAKEOVERRIDES:Nname=*} name='val'
-
-Fri Jun  1 14:08:02 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * make-conf.h (USE_IOVEC): make it conditional on HAVE_SYS_UIO_H
-
-       * Merged with NetBSD make
-       make -dx can now be used to run commands via sh -x
-       better error messages on exec failures.
-
-Thu May 31 01:44:54 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Makefile.in (main.o): depends on ${SRCS} ${MAKEFILE} so that
-       MAKE_VERSION gets updated.  Also don't use ?= for MAKE_VERSION,
-       MACHINE etc otherwise they propagate from the previous bmake.
-
-       * configure.in (machine): allow --with-machine=generic to make
-       configure use machine.sh to set MACHINE. 
-
-       * job.c (JobInterrupt): convert to using WAIT_T and friends.
-
-       * Makefile.in: mention in bmake.1 that we use autoconf.
-
-       * make.1: mention MAKE_PRINT_VAR_ON_ERROR.
-
-Wed May 30 23:17:18 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * main.c (ReadMakefile): don't set MAKEFILE if reading ".depend"
-       as that rather defeats the usefulness of ${MAKEFILE}.
-
-       * main.c (MainParseArgs): append command line variable assignments
-       to MAKEFLAGS so that they get propagated to child make's.
-       Apparently this is required POSIX behaviour?  Its useful anyway.
-
-Tue May 29 02:20:07 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * compat.c (CompatRunCommand): don't use perror() since stdio may
-       cause problems in child of vfork().
-
-       * compat.c, main.c: Call PrintOnError() when we are going to bail.
-       This routine prints out the .curdir where we stopped and will also
-       display any vars listed in ${MAKE_PRINT_VAR_ON_ERROR}.
-
-       * main.c: add ${.newline} to hold a "\n" - sometimes handy in
-       :@ expansion.
-
-       * var.c: VarLoopExpand: ignore addSpace if a \n is present.
-
-       * Added RCSid's for the files we've touched.
-       
-Thu May 24 15:41:37 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * configure.in: Thanks to some clues from mdb%juniper.net@localhost,
-       added autoconf magic to control setting of MACHINE, MACHINE_ARCH
-       as well as what ends up in _PATH_DEFSYSPATH.  We now have:
-
-  --with-machine=MACHINE  explicitly set MACHINE
-  --with-force-machine=MACHINE  set FORCE_MACHINE
-  --with-machine_arch=MACHINE_ARCH  explicitly set MACHINE_ARCH
-  --with-default-sys-path=PATH:DIR:LIST  use an explicit _PATH_DEFSYSPATH
-  --with-prefix-sys-path=PATH:DIR:LIST  prefix _PATH_PREFIX_SYSPATH
-  --with-path-objdirprefix=PATH  override _PATH_OBJDIRPREFIX
-       
-       If _PATH_OBJDIRPREFIX is set to "no" we won't define it.
-
-       * makefile: added a pathetically simple makefile to drive
-       bootstrapping.  Running configure by hand is more useful.
-
-       * Makefile.in: added MAKE_VERSION, and reworked things to be less
-       dependent on NetBSD bsd.*.mk
-       
-       * pathnames.h: allow NO_PATH_OBJDIRPREFIX to stop us defining
-       _PATH_OBJDIRPREFIX for those that don't want a default.
-       construct _PATH_DEFSYSPATH from the info we get from configure.
-
-       * main.c: allow for no _PATH_OBJDIRPREFIX, set ${MAKE_VERSION}
-       if MAKE_VERSION is defined.
-       
-       * compat.c: when we bail, print out the .CURDIR we were in.
-       
-Sat May 12 00:34:12 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-
-       * var.c: fixed a bug in the handling of the modifier :P
-       if the node as found but the path was null, we segfault trying to
-       duplicate it.
-
-Mon Mar  5 16:20:33 2001  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-       
-       * make.c: Make_OODate's test for a library out of date was using
-       cmtime where it should have used mtime (my bug).
-
-       * compat.c: Use perror() to tell us what really went wrong when we
-       cannot exec a command.
-       
-Fri Dec 15 10:11:08  2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-       
-Sat Jun 10 10:11:08  2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-       
-Thu Jun  1 10:11:08  2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-       
-Tue May 30 10:11:08  2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Merged with NetBSD make
-       
-Thu Apr 27 00:07:47 2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * util.c: don't provide signal() since we use sigcompat.c
-
-       * Makefile.in: added a build target.
-
-       * var.c (Var_Parse): added ODE modifiers :U, :D, :L, :P, :@ and :!
-       These allow some quite clever magic.
-
-       * main.c (main): added support for getenv(MAKESYSPATH).
-
-Mon Apr  2 16:25:13 2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Disable $PWD overriding getcwd() if MAKEOBJDIRPREFIX is set.
-       This avoids objdir having a different value depending on how a
-       directory was reached (via command line, or subdir.mk).
-
-       * If FORCE_MACHINE is defined, ignore getenv("MACHINE").
-       
-Mon Apr  2 23:15:31 2000  Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Do a chdir(${.CURDIR}) before invoking ${.MAKE} or ${.MAKE:T} if
-       MAKEOBJDIRPREFIX is set and NOCHECKMAKECHDIR is not.
-       I've been testing this in NetBSD's make for some weeks.
-
-       * Turn Makefile into Makefile.in and make it useful.
-       
-Tue Feb 29 22:08:00 2000 Simon J. Gerraty  <sjg%zen.quick.com.au@localhost>
-
-       * Imported NetBSD's -current make(1) and resolve conflicts.
-       
-       * Applied autoconf patches from bmake v2
-
-       * Imported clean code base from NetBSD-1.0
diff -r d5fa0a3de4bb -r d7a663b3c89b bootstrap/bmake/FILES
--- a/bootstrap/bmake/FILES     Tue Nov 01 01:05:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-FILES
-ChangeLog
-bmake.cat1
-Makefile.in
-PSD.doc/Makefile
-PSD.doc/tutorial.ms
-README
-arch.c
-bit.h
-buf.c
-buf.h
-compat.c
-cond.c
-make-conf.h
-config.h.in
-configure
-aclocal.m4
-configure.in
-dir.c
-dir.h
-find_lib.sh
-for.c
-getenv.c
-getopt.c
-hash.c
-hash.h
-install-sh
-job.c
-job.h
-trace.c
-trace.h
-list.h
-lst.h
-lst.lib/Makefile
-lst.lib/lstAppend.c
-lst.lib/lstAtEnd.c
-lst.lib/lstAtFront.c
-lst.lib/lstClose.c
-lst.lib/lstConcat.c
-lst.lib/lstDatum.c
-lst.lib/lstDeQueue.c
-lst.lib/lstDestroy.c
-lst.lib/lstDupl.c
-lst.lib/lstEnQueue.c
-lst.lib/lstFind.c
-lst.lib/lstFindFrom.c
-lst.lib/lstFirst.c
-lst.lib/lstForEach.c
-lst.lib/lstForEachFrom.c
-lst.lib/lstInit.c
-lst.lib/lstInsert.c
-lst.lib/lstInt.h
-lst.lib/lstIsAtEnd.c
-lst.lib/lstIsEmpty.c
-lst.lib/lstLast.c
-lst.lib/lstMember.c
-lst.lib/lstNext.c
-lst.lib/lstOpen.c
-lst.lib/lstRemove.c
-lst.lib/lstReplace.c
-lst.lib/lstSucc.c
-lst.lib/makefile.boot.in
-machine.sh
-main.c
-make.1
-make.c
-make.h
-makefile.boot.in
-missing/sys/cdefs.h
-mkdeps.sh
-nonints.h
-parse.c
-pathnames.h



Home | Main Index | Thread Index | Old Index