CVS commit: pkgsrc/devel/kbuild

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan  2 10:37:29 UTC 2018

Modified Files:
        pkgsrc/devel/kbuild: Makefile PLIST distinfo
        pkgsrc/devel/kbuild/patches: patch-kBuild_header.kmk
            patch-src_kmk_Makefile.kmk patch-src_kmk_kmkbuiltin_osdep.c
            patch-src_sed_lib_utils.c
Added Files:
        pkgsrc/devel/kbuild/files: SvnInfo.kmk
Removed Files:
        pkgsrc/devel/kbuild/files: strtofflags.c
        pkgsrc/devel/kbuild/patches: patch-Config.kmk
            patch-src_kash_Makefile.kmk patch-src_kmk_kmkbuiltin_install.c
            patch-src_kmk_kmkbuiltin_rm.c patch-src_lib_md5.c
            patch-src_sed_Makefile.kmk

Log Message:
kbuild: update to SVN 3127

Provided by ITOU (Sunagawa) Keiki in PR 52833.

Changes: only SVN commit list found, see
http://trac.netlabs.org/kbuild/timeline but this version is needed
to build Virtualbox.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/kbuild/Makefile \
    pkgsrc/devel/kbuild/PLIST pkgsrc/devel/kbuild/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/kbuild/files/SvnInfo.kmk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/kbuild/files/strtofflags.c
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/kbuild/patches/patch-Config.kmk \
    pkgsrc/devel/kbuild/patches/patch-src_kash_Makefile.kmk \
    pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_install.c \
    pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_rm.c \
    pkgsrc/devel/kbuild/patches/patch-src_lib_md5.c \
    pkgsrc/devel/kbuild/patches/patch-src_sed_Makefile.kmk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk \
    pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk \
    pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c \
    pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/kbuild/Makefile
diff -u pkgsrc/devel/kbuild/Makefile:1.1 pkgsrc/devel/kbuild/Makefile:1.2
--- pkgsrc/devel/kbuild/Makefile:1.1    Fri Jul  8 09:42:53 2016
+++ pkgsrc/devel/kbuild/Makefile        Tue Jan  2 10:37:29 2018
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2016/07/08 09:42:53 kamil Exp $
-#
+# $NetBSD: Makefile,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
 KBUILDNAME=    kBuild
 KBUILDVERMAJ=  0.1.9998
 KBUILDVERMIN=  8
-KBUILDVERSVN=  2814
+KBUILDVERSVN=  3127
 KBUILDVERFDR=  25
 
-DISTNAME=      ${KBUILDNAME}-${KBUILDVERMAJ}-${KBUILDVERMIN}.r${KBUILDVERSVN}.fc${KBUILDVERFDR}
-PKGNAME=       ${KBUILDNAME:tl}-${KBUILDVERMAJ}.${KBUILDVERMIN}.${KBUILDVERSVN}.${KBUILDVERFDR}
+DISTNAME=      ${KBUILDNAME}-r${KBUILDVERSVN}
+PKGNAME=       ${KBUILDNAME:tl}-${KBUILDVERMAJ}.${KBUILDVERMIN}.r${KBUILDVERSVN}
 CATEGORIES=    devel
-MASTER_SITES=  http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/k/
-EXTRACT_SUFX=  .src.rpm
+MASTER_SITES=  http://svn.netlabs.org/repos/kbuild/trunk
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://trac.netlabs.org/kbuild/wiki/WikiStart
@@ -19,11 +17,11 @@ COMMENT=    Framework for writing simple ma
 # but also various other licenses in 3rd party code
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/${KBUILDNAME}
+WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 MAKE_JOBS_SAFE=        no
 
-USE_TOOLS+=    pax lex gmake autoconf autoreconf automake autopoint
+USE_TOOLS+=    pax lex gmake autoconf autoreconf automake autopoint perl
 
 KBUILD_VERSION_PATCH=  ${KBUILDVERMAJ:E}
 
@@ -31,9 +29,34 @@ INSTALL_ENV+=        KBUILD_VERBOSE=2
 
 MAKE_ENV+=     KBUILD_LIB_SEARCH_PATHS="/lib /usr/lib ${X11BASE}/lib ${PREFIX}/lib"
 
+LDFLAGS+=      -lutil
+# honor CFLAGS and LDFLAGS
+MAKE_ENV+=     TEMPLATE_BIN-KMK_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=     TEMPLATE_BIN-KMK_LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=     TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=     TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
+
+INSTALL_ENV+=  TEMPLATE_BIN_CFLAGS=${CFLAGS:Q}
+INSTALL_ENV+=  TEMPLATE_BIN_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=  TEMPLATE_BIN-THREADED_CFLAGS=${CFLAGS:Q}
+INSTALL_ENV+=  TEMPLATE_BIN-THREADED_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=  kObjCache_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=  kDepPre_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=  kmk_sed_LDFLAGS=${LDFLAGS:Q}
+INSTALL_ENV+=  kmk_time_LDFLAGS=${LDFLAGS:Q}
+
+.PHONY: fetch-with-svn
+fetch-with-svn:
+       ${MKDIR} ${WRKDIR}; \
+       cd ${WRKDIR}; \
+       svn export -r${KBUILDVERSVN} ${MASTER_SITES}; \
+       ${MV} trunk ${DISTNAME}; \
+       tar czf ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}; \
+       ${MV} ${DISTNAME}${EXTRACT_SUFX} ${DISTDIR}; \
+       ${ECHO} do not forget to run "make makesum"
+
 post-extract:
-       ${RUN} cd ${WRKDIR} && ${EXTRACTOR} ${KBUILDNAME}-r${KBUILDVERSVN}.tar.gz
-       ${RUN} ${CP} ${FILESDIR}/strtofflags.c ${WRKSRC}/src/kmk/strtofflags.c
+       ${RUN} ${CP} ${FILESDIR}/SvnInfo.kmk ${WRKSRC}/
 
 pre-build:
 # Remove prebuilt files
Index: pkgsrc/devel/kbuild/PLIST
diff -u pkgsrc/devel/kbuild/PLIST:1.1 pkgsrc/devel/kbuild/PLIST:1.2
--- pkgsrc/devel/kbuild/PLIST:1.1       Fri Jul  8 09:42:53 2016
+++ pkgsrc/devel/kbuild/PLIST   Tue Jan  2 10:37:29 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/08 09:42:53 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/01/02 10:37:29 wiz Exp $
 bin/kDepIDB
 bin/kDepObj
 bin/kDepPre
@@ -26,6 +26,7 @@ bin/kmk_sed
 bin/kmk_sleep
 bin/kmk_test
 bin/kmk_time
+bin/kmk_touch
 share/doc/kBuild-0.1.9998/QuickReference-kBuild.txt
 share/doc/kBuild-0.1.9998/QuickReference-kmk.html
 share/doc/kBuild-0.1.9998/QuickReference-kmk.txt
@@ -120,6 +121,9 @@ share/kBuild/tools/VAC308.kmk
 share/kBuild/tools/VCC100.kmk
 share/kBuild/tools/VCC100AMD64.kmk
 share/kBuild/tools/VCC100X86.kmk
+share/kBuild/tools/VCC120.kmk
+share/kBuild/tools/VCC120AMD64.kmk
+share/kBuild/tools/VCC120X86.kmk
 share/kBuild/tools/VCC70.kmk
 share/kBuild/tools/VCC80.kmk
 share/kBuild/tools/VCC80AMD64.kmk
@@ -137,5 +141,6 @@ share/kBuild/units/lex.kmk
 share/kBuild/units/qt3.kmk
 share/kBuild/units/qt4.kmk
 share/kBuild/units/qt5.kmk
+share/kBuild/units/vccprecomp.kmk
 share/kBuild/units/yacc.kmk
 share/kBuild/up.kmk
Index: pkgsrc/devel/kbuild/distinfo
diff -u pkgsrc/devel/kbuild/distinfo:1.1 pkgsrc/devel/kbuild/distinfo:1.2
--- pkgsrc/devel/kbuild/distinfo:1.1    Fri Jul  8 09:42:53 2016
+++ pkgsrc/devel/kbuild/distinfo        Tue Jan  2 10:37:29 2018
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.1 2016/07/08 09:42:53 kamil Exp $
+$NetBSD: distinfo,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
-SHA1 (kBuild-0.1.9998-8.r2814.fc25.src.rpm) = e30482f4475673cf8824ac787f469b60aedf1263
-RMD160 (kBuild-0.1.9998-8.r2814.fc25.src.rpm) = 84b3cd3e4ee904c3ba5b2a95cd98aa3e4311902d
-SHA512 (kBuild-0.1.9998-8.r2814.fc25.src.rpm) = 103a6d35385348fdb63d5acc4662c6d6ef3a7cca42bfb6bb087445fdcc121e6bbbaca507b3313d83296c293116ebc478b1bce017023c4f438305e816ec443a6c
-Size (kBuild-0.1.9998-8.r2814.fc25.src.rpm) = 16094144 bytes
-SHA1 (patch-Config.kmk) = 87ef3f8419c39728b2a6eee51bb7d03dfdf7e8e9
-SHA1 (patch-kBuild_header.kmk) = 412b1bf3730c19072be494a9970acbda6c7e5d4f
-SHA1 (patch-src_kash_Makefile.kmk) = b2f1b4f47b5c1b51ebfa35f9e5efc75ec95ff642
-SHA1 (patch-src_kmk_Makefile.kmk) = 52730e797fa169775050b62ad4fdfa1562f8340b
-SHA1 (patch-src_kmk_kmkbuiltin_install.c) = 6a31de5ae58b7f92a8a3c13d8e6b89322d4c3c86
-SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = 1e450735063dd5bc1d9e4f8370c90720040d22d5
-SHA1 (patch-src_kmk_kmkbuiltin_rm.c) = 16196926da997aa5aeba5d2bd73407f334cd44a4
-SHA1 (patch-src_lib_md5.c) = f14e8fdd4d51e25fda8a876c09f31d11f32ffa6f
-SHA1 (patch-src_sed_Makefile.kmk) = eaebdbb2ce06d09f77b350bdaceb6161d9357575
-SHA1 (patch-src_sed_lib_utils.c) = 98df0a267680a4eb45fb93e4d699a234f5d8ec25
+SHA1 (kBuild-r3127.tar.gz) = 1f2d383c504a7881a2ef71b1470c2422b773316d
+RMD160 (kBuild-r3127.tar.gz) = aea4428954871e44ebb4ccb7bf1f4facc91a92a6
+SHA512 (kBuild-r3127.tar.gz) = 6a724892d32c25a08dede7969d3878dea2c18f47da30908b147451e36297f77fdb806c34c457524010d3eadf199858843a92ca4cef774a0b8a700471708cb36c
+Size (kBuild-r3127.tar.gz) = 17579258 bytes
+SHA1 (patch-kBuild_header.kmk) = bcba91ea5f4ae200087aa0adf4632b461661ed26
+SHA1 (patch-src_kmk_Makefile.kmk) = 7647322e79030bf794caa900feaf5dbe293a2247
+SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = de8a40b3a454abaf82b3384f0c44dd98794d0267
+SHA1 (patch-src_sed_lib_utils.c) = a2414f2d80623b94ab34fbc1744a2e3bc33571b3

Index: pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk
diff -u pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk:1.1 pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk:1.2
--- pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk:1.1     Fri Jul  8 09:42:54 2016
+++ pkgsrc/devel/kbuild/patches/patch-kBuild_header.kmk Tue Jan  2 10:37:29 2018
@@ -1,24 +1,24 @@
-$NetBSD: patch-kBuild_header.kmk,v 1.1 2016/07/08 09:42:54 kamil Exp $
+$NetBSD: patch-kBuild_header.kmk,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
 Add NetBSD support.
 
---- kBuild/header.kmk.orig     2016-04-29 00:52:38.000000000 +0000
-+++ kBuild/header.kmk
-@@ -610,10 +610,11 @@ SUFF_OBJ    := .o
+--- kBuild/header.kmk.orig     2017-10-31 19:58:59.266699000 +0900
++++ kBuild/header.kmk  2017-12-01 23:26:50.457456974 +0900
+@@ -648,10 +648,10 @@
  SUFF_LIB    := .a
  SUFF_DLL    := .so
  SUFF_EXE    :=
-- if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
-+ if1of ($(KBUILD_TARGET), dragonfly freebsd linux)
+- if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux netbsd openbsd) ## @todo check netbsd, gnuknbsd and openbsd.
++ if1of ($(KBUILD_TARGET), dragonfly freebsd gnukfbsd gnuknbsd linux openbsd) ## @todo check netbsd, gnuknbsd and openbsd.
  SUFF_SYS    := .ko
-+else ifeq ($(KBUILD_TARGET),netbsd)
-  else
+- else
 -SUFF_SYS    :=
++ else ifeq ($(KBUILD_TARGET),netbsd)
 +SUFF_SYS    := .kmod
   endif
  SUFF_RES    :=
  endif
-@@ -1337,8 +1338,7 @@ else
+@@ -1443,8 +1443,7 @@
   KBUILD_LIB_SEARCH_SUBS  :=
   KBUILD_LIB_SEARCH_ROOTS :=
  endif
@@ -28,7 +28,7 @@ Add NetBSD support.
  
  #
  # This is how we find the closest config.kmk.
-@@ -1617,4 +1617,3 @@ endif
+@@ -1744,4 +1743,3 @@
  # end-of-file-content
  __header_kmk__ := 1
  endif # !__header_kmk__
Index: pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk
diff -u pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk:1.1 pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk:1.2
--- pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk:1.1  Fri Jul  8 09:42:54 2016
+++ pkgsrc/devel/kbuild/patches/patch-src_kmk_Makefile.kmk      Tue Jan  2 10:37:29 2018
@@ -1,22 +1,11 @@
-$NetBSD: patch-src_kmk_Makefile.kmk,v 1.1 2016/07/08 09:42:54 kamil Exp $
+$NetBSD: patch-src_kmk_Makefile.kmk,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
 Add NetBSD support.
 
---- src/kmk/Makefile.kmk.orig  2015-12-22 14:58:34.000000000 +0000
-+++ src/kmk/Makefile.kmk
-@@ -107,6 +107,10 @@ kmkmissing_SOURCES.dragonfly = \
- kmkmissing_SOURCES.freebsd = \
-       glob/fnmatch.c
- 
-+kmkmissing_SOURCES.netbsd = \
-+      glob/fnmatch.c \
-+      strtofflags.c
-+
- kmkmissing_SOURCES.haiku = \
-       kmkbuiltin/haikufakes.c \
-       glob/fnmatch.c
-@@ -245,6 +249,9 @@ kmk_SOURCES = \
-       kbuild-object.c
+--- src/kmk/Makefile.kmk.orig  2017-11-26 23:29:40.000000000 +0900
++++ src/kmk/Makefile.kmk       2017-11-27 00:19:02.807006197 +0900
+@@ -264,6 +264,9 @@
+       w32/subproc/sub_proc.c
  
  kmk_DEFS.freebsd.x86 = CONFIG_WITHOUT_THREADS
 +kmk_DEFS.netbsd.x86 = CONFIG_WITHOUT_THREADS
@@ -25,7 +14,7 @@ Add NetBSD support.
  
  #kmk_LIBS.solaris = malloc
  #kmk_DEFS.solaris += HAVE_MALLINFO
-@@ -645,5 +652,3 @@ test_all: \
+@@ -702,5 +705,3 @@
          test_2ndtargetexp \
          test_30_continued_on_failure \
          test_lazy_deps_vars
Index: pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c
diff -u pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c:1.1 pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c:1.2
--- pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c:1.1    Fri Jul  8 09:42:54 2016
+++ pkgsrc/devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c        Tue Jan  2 10:37:29 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_kmk_kmkbuiltin_osdep.c,v 1.1 2016/07/08 09:42:54 kamil Exp $
+$NetBSD: patch-src_kmk_kmkbuiltin_osdep.c,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
 Add NetBSD support.
 
---- src/kmk/kmkbuiltin/osdep.c.orig    2015-06-21 21:21:29.000000000 +0000
-+++ src/kmk/kmkbuiltin/osdep.c
+--- src/kmk/kmkbuiltin/osdep.c.orig    2017-11-26 23:29:40.350768372 +0900
++++ src/kmk/kmkbuiltin/osdep.c 2017-12-02 00:41:40.030220196 +0900
 @@ -41,8 +41,10 @@
  #elif defined(__OpenBSD__)
  # include "openbsd.c"
  
 +#elif defined(__NetBSD__)
-+# include "strtofflags.c"
++# include <util.h>
 +
  #elif defined(__HAIKU__)
  # include "haikufakes.c"
Index: pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c
diff -u pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c:1.1 pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c:1.2
--- pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c:1.1   Fri Jul  8 09:42:54 2016
+++ pkgsrc/devel/kbuild/patches/patch-src_sed_lib_utils.c       Tue Jan  2 10:37:29 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_sed_lib_utils.c,v 1.1 2016/07/08 09:42:54 kamil Exp $
+$NetBSD: patch-src_sed_lib_utils.c,v 1.2 2018/01/02 10:37:29 wiz Exp $
 
 Add missing include.
 
---- src/sed/lib/utils.c.orig   2015-06-21 21:21:26.000000000 +0000
-+++ src/sed/lib/utils.c
+--- src/sed/lib/utils.c.orig   2017-11-26 23:30:40.000000000 +0900
++++ src/sed/lib/utils.c        2017-11-27 00:23:09.561021581 +0900
 @@ -35,6 +35,8 @@
  # include <stdlib.h>
  #endif /* HAVE_STDLIB_H */
@@ -12,4 +12,4 @@ Add missing include.
 +
  #include "utils.h"
  
- const char *myname;
+ #ifdef KBUILD_OS_WINDOWS /* bird: Way faster console output! */

Added files:

Index: pkgsrc/devel/kbuild/files/SvnInfo.kmk
diff -u /dev/null pkgsrc/devel/kbuild/files/SvnInfo.kmk:1.1
--- /dev/null   Tue Jan  2 10:37:29 2018
+++ pkgsrc/devel/kbuild/files/SvnInfo.kmk       Tue Jan  2 10:37:29 2018
@@ -0,0 +1,2 @@
+KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
+KBUILD_SVN_REV := 3127