pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/kbuild kbuild: update to SVN 3127
details: https://anonhg.NetBSD.org/pkgsrc/rev/ffb4bd7b2194
branches: trunk
changeset: 373460:ffb4bd7b2194
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Jan 02 10:37:29 2018 +0000
description:
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.
diffstat:
devel/kbuild/Makefile | 45 ++-
devel/kbuild/PLIST | 7 +-
devel/kbuild/distinfo | 24 +-
devel/kbuild/files/SvnInfo.kmk | 2 +
devel/kbuild/files/strtofflags.c | 196 ----------------
devel/kbuild/patches/patch-Config.kmk | 20 -
devel/kbuild/patches/patch-kBuild_header.kmk | 20 +-
devel/kbuild/patches/patch-src_kash_Makefile.kmk | 21 -
devel/kbuild/patches/patch-src_kmk_Makefile.kmk | 23 +-
devel/kbuild/patches/patch-src_kmk_kmkbuiltin_install.c | 21 -
devel/kbuild/patches/patch-src_kmk_kmkbuiltin_osdep.c | 8 +-
devel/kbuild/patches/patch-src_kmk_kmkbuiltin_rm.c | 16 -
devel/kbuild/patches/patch-src_lib_md5.c | 15 -
devel/kbuild/patches/patch-src_sed_Makefile.kmk | 22 -
devel/kbuild/patches/patch-src_sed_lib_utils.c | 8 +-
15 files changed, 75 insertions(+), 373 deletions(-)
diffs (truncated from 616 to 300 lines):
diff -r f8c3350d621d -r ffb4bd7b2194 devel/kbuild/Makefile
--- a/devel/kbuild/Makefile Tue Jan 02 10:36:19 2018 +0000
+++ b/devel/kbuild/Makefile Tue Jan 02 10:37:29 2018 +0000
@@ -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 @@
# 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 @@
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
diff -r f8c3350d621d -r ffb4bd7b2194 devel/kbuild/PLIST
--- a/devel/kbuild/PLIST Tue Jan 02 10:36:19 2018 +0000
+++ b/devel/kbuild/PLIST Tue Jan 02 10:37:29 2018 +0000
@@ -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_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/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/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
diff -r f8c3350d621d -r ffb4bd7b2194 devel/kbuild/distinfo
--- a/devel/kbuild/distinfo Tue Jan 02 10:36:19 2018 +0000
+++ b/devel/kbuild/distinfo Tue Jan 02 10:37:29 2018 +0000
@@ -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
diff -r f8c3350d621d -r ffb4bd7b2194 devel/kbuild/files/SvnInfo.kmk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/kbuild/files/SvnInfo.kmk Tue Jan 02 10:37:29 2018 +0000
@@ -0,0 +1,2 @@
+KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
+KBUILD_SVN_REV := 3127
diff -r f8c3350d621d -r ffb4bd7b2194 devel/kbuild/files/strtofflags.c
--- a/devel/kbuild/files/strtofflags.c Tue Jan 02 10:36:19 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/*
- * From http://ftp.netbsd.org/pub/NetBSD/misc/alc/libc/strtofflags.c
- */
-
-/* $NetBSD: strtofflags.c,v 1.1 2016/07/08 09:51:34 kamil Exp $ */
-
-/*-
- * Copyright (c) 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)stat_flags.c 8.1 (Berkeley) 5/31/93
- * $FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.18.2.1 2000/06/28 01:52:24 joe Exp $
- * $DragonFly: src/lib/libc/gen/strtofflags.c,v 1.5 2008/06/02 20:17:07 dillon Exp $
- */
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: strtofflags.c,v 1.1 2016/07/08 09:51:34 kamil Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static struct {
- char *name;
- u_long flag;
- int invert;
-} mapping[] = {
- /* shorter names per flag first, all prefixed by "no" */
-#ifdef SF_APPEND
- { "nosappnd", SF_APPEND, 0 },
- { "nosappend", SF_APPEND, 0 },
-#endif
-#ifdef SF_ARCHIVED
- { "noarch", SF_ARCHIVED, 0 },
- { "noarchived", SF_ARCHIVED, 0 },
-#endif
-#ifdef SF_IMMUTABLE
- { "noschg", SF_IMMUTABLE, 0 },
- { "noschange", SF_IMMUTABLE, 0 },
- { "nosimmutable", SF_IMMUTABLE, 0 },
-#endif
-#ifdef SF_NOHISTORY
- { "noshistory", SF_NOHISTORY, 1 },
-#endif
-#ifdef SF_NOUNLINK
- { "nosunlnk", SF_NOUNLINK, 1 },
- { "nosunlink", SF_NOUNLINK, 1 },
-#endif
-#ifdef UF_APPEND
- { "nouappnd", UF_APPEND, 0 },
- { "nouappend", UF_APPEND, 0 },
-#endif
-#ifdef UF_IMMUTABLE
- { "nouchg", UF_IMMUTABLE, 0 },
- { "nouchange", UF_IMMUTABLE, 0 },
- { "nouimmutable", UF_IMMUTABLE, 0 },
-#endif
-#ifdef UF_NODUMP
- { "nodump", UF_NODUMP, 1 },
-#endif
-#ifdef UF_OPAQUE
- { "noopaque", UF_OPAQUE, 0 },
-#endif
-#ifdef UF_NOHISTORY
- { "nouhistory", UF_NOHISTORY, 1 },
- { "nohistory", UF_NOHISTORY, 1 },
-#endif
-#ifdef UF_NOUNLINK
- { "nouunlnk", UF_NOUNLINK, 1 },
- { "nouunlink", UF_NOUNLINK, 1 },
-#endif
-};
-
-#define MAXFLAGLEN 12
-#define NMAPPING __arraycount(mapping)
-
-/*
- * fflagstostr --
- * Convert file flags to a comma-separated string. If no flags
- * are set, return the empty string.
- */
-static inline char *
-fflagstostr(u_long flags)
-{
- char *string;
- char *sp, *dp;
- u_long setflags;
- int i;
-
- string = malloc(NMAPPING * (MAXFLAGLEN + 1));
- if (string == NULL)
- goto out;
-
- setflags = flags;
- dp = string;
- for (i = 0; i < NMAPPING; i++) {
- if ((setflags & mapping[i].flag) == 0)
- continue;
-
- if (dp > string)
- *dp++ = ',';
-
- sp = mapping[i].name;
- if (mapping[i].invert)
- sp += 2;
-
- while (*sp != '\0')
- *dp++ = *sp++;
-
- setflags &= ~mapping[i].flag;
- }
- *dp = '\0';
-
-out:
- return string;
-}
-
-/*
- * strtofflags --
- * Take string of arguments and return file flags. Return 0 on
- * success, 1 on failure. On failure, stringp is set to point
Home |
Main Index |
Thread Index |
Old Index