pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Tue Feb 18 13:06:29 UTC 2025
Modified Files:
pkgsrc/bootstrap: bootstrap
pkgsrc/mk: bsd.prefs.mk
pkgsrc/mk/features: features.mk
pkgsrc/pkgtools/libnbcompat: Makefile PLIST
pkgsrc/pkgtools/libnbcompat/files: Makefile.in getopt_long.c
Added Files:
pkgsrc/pkgtools/libnbcompat: buildlink3.mk
Log Message:
libnbcompat: Convert to a proper package.
Building this inline meant an excessive number of copies were built
during bootstrap, one for every package that required it. Now only
one package is built, significantly reducing bootstrap time.
>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit b671d8cd0be775fe2245d1cb5ba402f17ae95e94
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.454 -r1.455 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/features/features.mk
cvs rdiff -u -r1.94 -r1.95 pkgsrc/pkgtools/libnbcompat/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/pkgtools/libnbcompat/PLIST
cvs rdiff -u -r0 -r1.20 pkgsrc/pkgtools/libnbcompat/buildlink3.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/pkgtools/libnbcompat/files/Makefile.in
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/libnbcompat/files/getopt_long.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.326 pkgsrc/bootstrap/bootstrap:1.327
--- pkgsrc/bootstrap/bootstrap:1.326 Tue Feb 18 11:26:48 2025
+++ pkgsrc/bootstrap/bootstrap Tue Feb 18 13:06:28 2025
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.326 2025/02/18 11:26:48 wiz Exp $
+# $NetBSD: bootstrap,v 1.327 2025/02/18 13:06:28 wiz Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -1481,6 +1481,12 @@ build_package_nopreserve() {
}
#
+# Build libnbcompat first, avoiding -DPKG_PRESERVE as it is only a build
+# dependency.
+#
+build_package_nopreserve "pkgtools/libnbcompat"
+
+#
# Special packages that we don't want marked with BOOTSTRAP_PKG, but must be
# built (if required) without -DPKG_PRESERVE set so that they can be deleted.
#
Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.454 pkgsrc/mk/bsd.prefs.mk:1.455
--- pkgsrc/mk/bsd.prefs.mk:1.454 Tue Feb 18 11:47:48 2025
+++ pkgsrc/mk/bsd.prefs.mk Tue Feb 18 13:06:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.454 2025/02/18 11:47:48 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.455 2025/02/18 13:06:28 wiz Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -1010,6 +1010,7 @@ _PKGSRC_USE_CTF= no
# explicitly requested them, or if they haven't but the compiler/platform is
# known to support them.
.if empty(PKGPATH:Mpkgtools/cwrappers) && \
+ empty(PKGPATH:Mpkgtools/libnbcompat) && \
(${USE_CWRAPPERS:tl} == "yes" || \
(${USE_CWRAPPERS:tl} == "auto" && \
${_OPSYS_SUPPORTS_CWRAPPERS:Uno} == "yes"))
@@ -1019,7 +1020,9 @@ _USE_CWRAPPERS= no
.endif
# Use C-based tools to speed up pkgsrc infrastructure tasks.
-.if empty(PKGPATH:Mpkgtools/mktools) && \
+.if empty(PKGPATH:Mpkgtools/cwrappers) && \
+ empty(PKGPATH:Mpkgtools/libnbcompat) && \
+ empty(PKGPATH:Mpkgtools/mktools) && \
(${PKGSRC_USE_MKTOOLS:tl} == "yes" || \
(${PKGSRC_USE_MKTOOLS:tl} == "auto" && \
${_OPSYS_SUPPORTS_MKTOOLS:Uno} == "yes"))
Index: pkgsrc/mk/features/features.mk
diff -u pkgsrc/mk/features/features.mk:1.12 pkgsrc/mk/features/features.mk:1.13
--- pkgsrc/mk/features/features.mk:1.12 Sat Apr 20 13:43:49 2024
+++ pkgsrc/mk/features/features.mk Tue Feb 18 13:06:28 2025
@@ -1,16 +1,7 @@
-# $NetBSD: features.mk,v 1.12 2024/04/20 13:43:49 nia Exp $
+# $NetBSD: features.mk,v 1.13 2025/02/18 13:06:28 wiz Exp $
#
# This file is included by bsd.pkg.mk.
#
-# Variables defined by this file:
-#
-# FEATURE_CPPFLAGS
-# FEATURE_LDFLAGS
-# FEATURE_LIBS
-# Preprocessor and linker flags needed to build and to link against
-# the headers and libraries that supply the features missing from
-# the system.
-#
.if defined(MISSING_FEATURES)
#
@@ -25,14 +16,7 @@ PKG_SKIP_REASON+= "${PKGNAME} requires I
. endif
. endif
-FEATURE_CPPFLAGS= # empty
-FEATURE_LDFLAGS= # empty
-FEATURE_LIBS= # empty
-
-CPPFLAGS+= ${FEATURE_CPPFLAGS}
-LDFLAGS+= ${FEATURE_LDFLAGS}
-LIBS+= ${FEATURE_LIBS}
-
+#
# libnbcompat provides many of the current features.
#
_FEATURE_USE_NBCOMPAT?= no
@@ -43,40 +27,7 @@ _FEATURE_USE_NBCOMPAT= yes
. endfor
. if ${_FEATURE_USE_NBCOMPAT} == "yes"
-. include "${PKGSRCDIR}/pkgtools/libnbcompat/inplace.mk"
-FEATURE_CPPFLAGS+= ${CPPFLAGS.nbcompat}
-FEATURE_LDFLAGS+= ${LDFLAGS.nbcompat}
-FEATURE_LIBS+= ${LDADD.nbcompat}
-. endif
-
-. if (${_FEATURE_USE_NBCOMPAT} == "yes") && !empty(MISSING_FEATURES:Mcdefs)
-BUILDLINK_TARGETS+= features-sys-cdefs-h
-. endif
-. if (${_FEATURE_USE_NBCOMPAT} == "yes") && \
- (!empty(MISSING_FEATURES:Mfts_close) || \
- !empty(MISSING_FEATURES:Mfts_open) || \
- !empty(MISSING_FEATURES:Mfts_read) || \
- !empty(MISSING_FEATURES:Mfts_set))
-BUILDLINK_TARGETS+= features-fts-h
-. endif
-. if (${_FEATURE_USE_NBCOMPAT} == "yes") && !empty(MISSING_FEATURES:Mglob)
-BUILDLINK_TARGETS+= features-glob-h
+. include "../../pkgtools/libnbcompat/buildlink3.mk"
. endif
-. if (${_FEATURE_USE_NBCOMPAT} == "yes") && !empty(MISSING_FEATURES:Mregcomp)
-BUILDLINK_TARGETS+= features-regex-h
-. endif
-
-. for _file_ in fts.h glob.h regex.h sys/cdefs.h
-.PHONY: features-${_file_:S/./-/:S/\//-/}
-features-${_file_:S/./-/:S/\//-/}:
- ${RUN}set -e; \
- nbcompat_header=${LIBNBCOMPAT_SRCDIR:Q}/nbcompat/`${BASENAME} ${_file_:Q}`; \
- header=${BUILDLINK_DIR:Q}/include/${_file_:Q}; \
- if ${TEST} ! -f "$$header" -a -f "$$nbcompat_header"; then \
- ${ECHO_BUILDLINK_MSG} "Creating $$header."; \
- ${MKDIR} `${DIRNAME} "$$header"`; \
- ${LN} -s "$$nbcompat_header" "$$header"; \
- fi
-. endfor
.endif # MISSING_FEATURES
Index: pkgsrc/pkgtools/libnbcompat/Makefile
diff -u pkgsrc/pkgtools/libnbcompat/Makefile:1.94 pkgsrc/pkgtools/libnbcompat/Makefile:1.95
--- pkgsrc/pkgtools/libnbcompat/Makefile:1.94 Mon Aug 5 11:29:53 2024
+++ pkgsrc/pkgtools/libnbcompat/Makefile Tue Feb 18 13:06:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2024/08/05 11:29:53 tnn Exp $
+# $NetBSD: Makefile,v 1.95 2025/02/18 13:06:28 wiz Exp $
#
# NOTE: If you update this package, it is *mandatory* that you update
# pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
@@ -17,7 +17,13 @@ GNU_CONFIGURE= yes
MAKE_ENV+= LIBMODE=${LIBMODE}
# Enable by default for standalone builds
-CONFIGURE_ARGS+= --enable-db
+CONFIGURE_ARGS+= --enable-bsd-getopt --enable-db
+
+# Avoid any dependency cycles
+CHECK_PERMS_SKIP= *
+CHECK_PORTABILITY_SKIP= *
+PKGSRC_LOCKTYPE= none
+IGNORE_CCACHE= yes
do-extract:
@${CP} -R ${FILESDIR} ${WRKSRC}
Index: pkgsrc/pkgtools/libnbcompat/PLIST
diff -u pkgsrc/pkgtools/libnbcompat/PLIST:1.19 pkgsrc/pkgtools/libnbcompat/PLIST:1.20
--- pkgsrc/pkgtools/libnbcompat/PLIST:1.19 Sun Jun 14 21:02:45 2009
+++ pkgsrc/pkgtools/libnbcompat/PLIST Tue Feb 18 13:06:28 2025
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 21:02:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2025/02/18 13:06:28 wiz Exp $
include/nbcompat.h
include/nbcompat/assert.h
include/nbcompat/cdefs.h
+include/nbcompat/config.h
include/nbcompat/ctype.h
include/nbcompat/db.h
include/nbcompat/dirent.h
Index: pkgsrc/pkgtools/libnbcompat/files/Makefile.in
diff -u pkgsrc/pkgtools/libnbcompat/files/Makefile.in:1.39 pkgsrc/pkgtools/libnbcompat/files/Makefile.in:1.40
--- pkgsrc/pkgtools/libnbcompat/files/Makefile.in:1.39 Sat May 2 12:52:59 2015
+++ pkgsrc/pkgtools/libnbcompat/files/Makefile.in Tue Feb 18 13:06:29 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.39 2015/05/02 12:52:59 joerg Exp $
+# $NetBSD: Makefile.in,v 1.40 2025/02/18 13:06:29 wiz Exp $
#
srcdir= @srcdir@
@@ -24,6 +24,7 @@ LIB= libnbcompat.a
INCS= nbcompat.h \
nbcompat/assert.h \
nbcompat/cdefs.h \
+ nbcompat/config.h \
nbcompat/ctype.h \
nbcompat/dirent.h \
nbcompat/endian.h \
Index: pkgsrc/pkgtools/libnbcompat/files/getopt_long.c
diff -u pkgsrc/pkgtools/libnbcompat/files/getopt_long.c:1.11 pkgsrc/pkgtools/libnbcompat/files/getopt_long.c:1.12
--- pkgsrc/pkgtools/libnbcompat/files/getopt_long.c:1.11 Tue Apr 14 17:34:41 2009
+++ pkgsrc/pkgtools/libnbcompat/files/getopt_long.c Tue Feb 18 13:06:29 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt_long.c,v 1.11 2009/04/14 17:34:41 joerg Exp $ */
+/* $NetBSD: getopt_long.c,v 1.12 2025/02/18 13:06:29 wiz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <nbcompat.h>
#include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: getopt_long.c,v 1.11 2009/04/14 17:34:41 joerg Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.12 2025/02/18 13:06:29 wiz Exp $");
#if 0
#include "namespace.h"
@@ -68,9 +68,6 @@ int optind = 1; /* index into parent ar
int optopt = '?'; /* character checked for validity */
char *optarg; /* argument associated with option */
#endif
-#if !HAVE_DECL_OPTRESET
-int optreset; /* reset getopt */
-#endif
#if 0
#ifdef __weak_alias
@@ -191,11 +188,8 @@ getopt_internal(int nargc, char **nargv,
if (optind == 0)
optind = 1;
- if (optreset)
- nonopt_start = nonopt_end = -1;
start:
- if (optreset || !*place) { /* update scanning pointer */
- optreset = 0;
+ if (!*place) { /* update scanning pointer */
if (optind >= nargc) { /* end of argument vector */
place = EMSG;
if (nonopt_end != -1) {
Added files:
Index: pkgsrc/pkgtools/libnbcompat/buildlink3.mk
diff -u /dev/null pkgsrc/pkgtools/libnbcompat/buildlink3.mk:1.20
--- /dev/null Tue Feb 18 13:06:29 2025
+++ pkgsrc/pkgtools/libnbcompat/buildlink3.mk Tue Feb 18 13:06:28 2025
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.20 2025/02/18 13:06:28 wiz Exp $
+
+BUILDLINK_TREE+= libnbcompat
+
+.if !defined(LIBNBCOMPAT_BUILDLINK3_MK)
+LIBNBCOMPAT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libnbcompat+= libnbcompat>=20221013
+BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
+BUILDLINK_DEPMETHOD.libnbcompat?= build
+
+BUILDLINK_CPPFLAGS.libnbcompat+= -DHAVE_NBCOMPAT_H=1
+BUILDLINK_LIBS.libnbcompat+= -lnbcompat
+.endif # LIBNBCOMPAT_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libnbcompat
Home |
Main Index |
Thread Index |
Old Index