pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/bmake/files Merge changes.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3462acf82590
branches:  trunk
changeset: 549959:3462acf82590
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 11 14:37:05 2008 +0000

description:
Merge changes.

diffstat:

 devel/bmake/files/ChangeLog              |    59 +
 devel/bmake/files/FILES                  |     1 +
 devel/bmake/files/Makefile.in            |    18 +-
 devel/bmake/files/arch.c                 |    24 +-
 devel/bmake/files/boot-strap             |     4 +-
 devel/bmake/files/buf.c                  |    12 +-
 devel/bmake/files/cond.c                 |    15 +-
 devel/bmake/files/config.h.in            |    41 +-
 devel/bmake/files/configure              |  8272 ++++++++++++++++++-----------
 devel/bmake/files/dir.c                  |    36 +-
 devel/bmake/files/for.c                  |    12 +-
 devel/bmake/files/hash.c                 |    12 +-
 devel/bmake/files/job.c                  |    20 +-
 devel/bmake/files/lst.lib/lstInt.h       |     4 +-
 devel/bmake/files/main.c                 |   137 +-
 devel/bmake/files/make.1                 |   121 +-
 devel/bmake/files/nonints.h              |    18 +-
 devel/bmake/files/parse.c                |    80 +-
 devel/bmake/files/str.c                  |    14 +-
 devel/bmake/files/suff.c                 |    36 +-
 devel/bmake/files/targ.c                 |    10 +-
 devel/bmake/files/trace.c                |     6 +-
 devel/bmake/files/trace.h                |     2 +-
 devel/bmake/files/unit-tests/Makefile.in |     8 +-
 devel/bmake/files/unit-tests/cond1       |     4 +-
 devel/bmake/files/unit-tests/test.exp    |    10 +-
 devel/bmake/files/unit-tests/varcmd      |    20 +-
 devel/bmake/files/util.c                 |   186 +-
 devel/bmake/files/var.c                  |    99 +-
 29 files changed, 5622 insertions(+), 3659 deletions(-)

diffs (truncated from 13310 to 300 lines):

diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/ChangeLog
--- a/devel/bmake/files/ChangeLog       Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/ChangeLog       Tue Nov 11 14:37:05 2008 +0000
@@ -1,3 +1,62 @@
+2008-11-04  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20081101
+       * Merge with NetBSD make, pick up:
+         o util.c: avoid use of putenv() - christos
+
+2008-10-30  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20081030
+         pick up man page tweaks.
+
+2008-10-29  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in: move processing of LIBOBJS to after is definition!
+         thus we'll have getenv.c in SRCS only if needed.
+
+       * make.1: add examples of how to use :?
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20081029
+       * Merge with NetBSD make, pick up:
+         o fix for .END processing with -j
+         o segfault from Parse_Error when no makefile is open
+         o handle numeric expressions in any variable expansion
+         o debug output now defaults to stderr, -dF to change it - apb
+         o make now uses bmake_malloc etc so that it can build natively 
+           on OS/X - wasn't an issue for bmake, but we want to keep in sync.
+
+2008-09-27  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20080808
+       * Merge with NetBSD make, pick up:
+         o fix for PR/38840: Pierre Pronchery: make crashes while parsing
+           long lines in Makefiles 
+         o optimizations for VarQuote by joerg
+         o fix for PR/38756: dominik: make dumps core on invalid makefile
+       
+2008-05-15  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20080515
+       * Merge with NetBSD make, pick up:
+         o fix skip setting vars in VAR_GLOBAL context, to handle
+           cases where VAR_CMD is used for other than command line vars.
+
+2008-05-14  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * boot-strap (make_version): we may need to look in
+       $prefix/share/mk for sys.mk 
+
+       * Makefile.in (BMAKE_VERSION): bump version to 20080514
+       * Merge with NetBSD make, pick up:
+         o skip setting vars in VAR_GLOBAL context, when already set in
+         VAR_CMD which takes precedence.
+
+2008-03-30  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
+
+       * Makefile.in (BMAKE_VERSION):  bump version to 20080330
+       * Merge with NetBSD make, pick up:
+         o fix for ?= when LHS contains variable reference.
+
 2008-02-15  Simon J. Gerraty  <sjg%void.crufty.net@localhost>
 
        * merge some patches from NetBSD pkgsrc.
diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/FILES
--- a/devel/bmake/files/FILES   Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/FILES   Tue Nov 11 14:37:05 2008 +0000
@@ -93,6 +93,7 @@
 unit-tests/modts
 unit-tests/modword
 unit-tests/posix
+unit-tests/qequals
 unit-tests/ternary
 unit-tests/test.exp
 unit-tests/varcmd
diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in     Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/Makefile.in     Tue Nov 11 14:37:05 2008 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.in,v 1.10 2008/07/03 11:28:52 obache Exp $
+#      $NetBSD: Makefile.in,v 1.11 2008/11/11 14:37:05 joerg Exp $
 #      @(#)Makefile    5.2 (Berkeley) 12/28/90
 
-#      $Id: Makefile.in,v 1.10 2008/07/03 11:28:52 obache Exp $
+#      $Id: Makefile.in,v 1.11 2008/11/11 14:37:05 joerg Exp $
 
 PROG=  bmake
 SRCS=  arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -13,17 +13,13 @@
        lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c
 SRCS += lstPrev.c
 
-.if !empty(LIBOBJS)
-SRCS+= ${LIBOBJS:.o=.c}
-.endif
-
 # you can use this Makefile if you have an earlier version of bmake.
 prefix= @prefix@
 srcdir= @srcdir@
 CC?= @CC@
 
 # Base version on src date
-BMAKE_VERSION= 20080215
+BMAKE_VERSION= 20081101
 # knowing when it was built is also handy
 BUILD_DATE!= date +%Y%m%d
 MAKE_VERSION:= bmake-${BMAKE_VERSION} build-${BUILD_DATE}
@@ -41,6 +37,10 @@
 LIBOBJS= @LIBOBJS@
 LDADD= @LIBS@
 
+.if !empty(LIBOBJS)
+SRCS+= ${LIBOBJS:T:.o=.c}
+.endif
+
 .PATH: ${srcdir}
 .PATH: ${srcdir}/lst.lib
 
@@ -61,7 +61,7 @@
 # XXX not sure if we still want this given that configure
 # lets us force or not the definition of MACHINE.
 CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\""
-SRCS+=  getenv.c
+MANTARGET=cat
 INSTALL?=${srcdir}/install-sh
 .if (${MACHINE} == "sun386")
 # even I don't have one of these anymore :-)
@@ -126,7 +126,7 @@
 .ifdef TOOLDIR
 # this is a native netbsd build, 
 # use libutil rather than the local emalloc etc.
-CPPFLAGS+= -DHAVE_EMALLOC
+CPPFLAGS+= -DUSE_EMALLOC
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 .endif
diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/arch.c
--- a/devel/bmake/files/arch.c  Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/arch.c  Tue Nov 11 14:37:05 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.2 2008/03/09 19:54:29 joerg Exp $   */
+/*     $NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.2 2008/03/09 19:54:29 joerg Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c     8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.2 2008/03/09 19:54:29 joerg Exp $");
+__RCSID("$NetBSD: arch.c,v 1.3 2008/11/11 14:37:05 joerg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -393,7 +393,7 @@
             * are just placed at the end of the nodeLst we're returning.
             */
            sz = strlen(memName)+strlen(libName)+3;
-           buf = sacrifice = emalloc(sz);
+           buf = sacrifice = bmake_malloc(sz);
 
            snprintf(buf, sz, "%s(%s)", libName, memName);
 
@@ -428,14 +428,14 @@
            Lst   members = Lst_Init(FALSE);
            char  *member;
            size_t sz = MAXPATHLEN, nsz;
-           nameBuf = emalloc(sz);
+           nameBuf = bmake_malloc(sz);
 
            Dir_Expand(memName, dirSearchPath, members);
            while (!Lst_IsEmpty(members)) {
                member = (char *)Lst_DeQueue(members);
                nsz = strlen(libName) + strlen(member) + 3;
                if (sz > nsz)
-                   nameBuf = erealloc(nameBuf, sz = nsz * 2);
+                   nameBuf = bmake_realloc(nameBuf, sz = nsz * 2);
 
                snprintf(nameBuf, sz, "%s(%s)", libName, member);
                free(member);
@@ -459,7 +459,7 @@
            free(nameBuf);
        } else {
            size_t      sz = strlen(libName) + strlen(memName) + 3;
-           nameBuf = emalloc(sz);
+           nameBuf = bmake_malloc(sz);
            snprintf(nameBuf, sz, "%s(%s)", libName, memName);
            gn = Targ_FindNode(nameBuf, TARG_CREATE);
            free(nameBuf);
@@ -639,8 +639,8 @@
            return (NULL);
     }
 
-    ar = emalloc(sizeof(Arch));
-    ar->name = estrdup(archive);
+    ar = bmake_malloc(sizeof(Arch));
+    ar->name = bmake_strdup(archive);
     ar->fnametab = NULL;
     ar->fnamesize = 0;
     Hash_InitTable(&ar->members, -1);
@@ -715,7 +715,7 @@
 #endif
 
            he = Hash_CreateEntry(&ar->members, memName, NULL);
-           Hash_SetValue(he, emalloc(sizeof(struct ar_hdr)));
+           Hash_SetValue(he, bmake_malloc(sizeof(struct ar_hdr)));
            memcpy(Hash_GetValue(he), &arh, sizeof(struct ar_hdr));
        }
        fseek(arch, (size + 1) & ~1, SEEK_CUR);
@@ -789,7 +789,7 @@
         * This is a table of archive names, so we build one for
         * ourselves
         */
-       ar->fnametab = emalloc(size);
+       ar->fnametab = bmake_malloc(size);
        ar->fnamesize = size;
 
        if (fread(ar->fnametab, size, 1, arch) != 1) {
@@ -1212,7 +1212,7 @@
     char           *libName;   /* file name for archive */
     size_t          sz = strlen(gn->name) + 6 - 2;
 
-    libName = emalloc(sz);
+    libName = bmake_malloc(sz);
     snprintf(libName, sz, "lib%s.a", &gn->name[2]);
 
     gn->path = Dir_FindFile(libName, path);
diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/boot-strap
--- a/devel/bmake/files/boot-strap      Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/boot-strap      Tue Nov 11 14:37:05 2008 +0000
@@ -51,7 +51,7 @@
 #      Simon J. Gerraty <sjg%crufty.net@localhost>
 
 # RCSid:
-#      $Id: boot-strap,v 1.3 2008/03/09 19:54:29 joerg Exp $
+#      $Id: boot-strap,v 1.4 2008/11/11 14:37:05 joerg Exp $
 #
 #      @(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -192,7 +192,7 @@
 # If -q given, we don't want all the install instructions
 $quiet exit 0
 
-make_version=`./bmake -m ./mk -m /usr/share/mk -f ./Makefile -V MAKE_VERSION | ( read one two; echo $one )`
+make_version=`./bmake -m ./mk -m $prefix/share/mk -m /usr/share/mk -f ./Makefile -V MAKE_VERSION | ( read one two; echo $one )`
 
 install_prefix() {
        bindir=$1/bin
diff -r 924d0386fae4 -r 3462acf82590 devel/bmake/files/buf.c
--- a/devel/bmake/files/buf.c   Tue Nov 11 14:28:22 2008 +0000
+++ b/devel/bmake/files/buf.c   Tue Nov 11 14:37:05 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: buf.c,v 1.2 2008/03/09 19:54:29 joerg Exp $    */
+/*     $NetBSD: buf.c,v 1.3 2008/11/11 14:37:05 joerg Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: buf.c,v 1.2 2008/03/09 19:54:29 joerg Exp $";
+static char rcsid[] = "$NetBSD: buf.c,v 1.3 2008/11/11 14:37:05 joerg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)buf.c      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: buf.c,v 1.2 2008/03/09 19:54:29 joerg Exp $");
+__RCSID("$NetBSD: buf.c,v 1.3 2008/11/11 14:37:05 joerg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -105,7 +105,7 @@
 #define BufExpand(bp,nb) \
        while (bp->left < (nb)+1) {\
            int newSize = (bp)->size * 2; \
-           Byte  *newBuf = (Byte *)erealloc((bp)->buffer, newSize); \
+           Byte  *newBuf = (Byte *)bmake_realloc((bp)->buffer, newSize); \
            \
            (bp)->inPtr = newBuf + ((bp)->inPtr - (bp)->buffer); \
            (bp)->outPtr = newBuf + ((bp)->outPtr - (bp)->buffer);\
@@ -267,13 +267,13 @@
 {
     Buffer bp;         /* New Buffer */
 
-    bp = emalloc(sizeof(*bp));
+    bp = bmake_malloc(sizeof(*bp));
 



Home | Main Index | Thread Index | Old Index