tech-pkg archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
Re: Removing built-in support for sqlite3
On Tue, Jul 23, 2024 at 07:37:30AM -0400, Greg Troxel wrote:
> The proposal on the table is:
>
> base sqlite3 is never acceptable (builtin.mk always says no, or we
> don't have one)
>
> builtin.mk for any package where base uses base sqlite3 is coded to
> reject it
>
> and that seems necessary and sufficient.
Here's my proposed patch implementing this.
(It also removes the heimdal version detection code that is now
unneeded.)
Thomas
Index: security/heimdal/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/builtin.mk,v
retrieving revision 1.20
diff -u -r1.20 builtin.mk
--- security/heimdal/builtin.mk 13 Jan 2024 20:10:07 -0000 1.20
+++ security/heimdal/builtin.mk 2 Aug 2024 08:00:53 -0000
@@ -20,6 +20,12 @@
. if empty(H_HEIMDAL:M__nonexistent__) && empty(H_HEIMDAL:M${LOCALBASE}/*)
IS_BUILTIN.heimdal= yes
. endif
+# heimdal in NetBSD<10 links against sqlite3, which might lead to linking
+# against multiple versions of sqlite3.
+# For that reason, do not accept that version as built-in.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
+IS_BUILTIN.heimdal= no
+.endif
.endif
MAKEVARS+= IS_BUILTIN.heimdal
@@ -34,30 +40,6 @@
${_CROSS_DESTDIR:U:Q}${SH_KRB5_CONFIG:Q} --version | \
${AWK} '{ print $2ドル; exit }'
. else
-#
-# heimdal<=0.6.x doesn't have a method of checking files to discover
-# the version number of the software. Match up heimdal versions with
-# OS versions for an approximate determination of the heimdal version.
-#
-_BLTN_HEIMDAL_VERSIONS= 0.6.3 0.6.2 0.6.1 0.6 0.5 0.4e 0.3f 0.3e
-_BLTN_HEIMDAL_0.6.3= NetBSD-2.* NetBSD-[3-9]*-*
-_BLTN_HEIMDAL_0.6.2= # empty
-_BLTN_HEIMDAL_0.6.1= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
-_BLTN_HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-*
-_BLTN_HEIMDAL_0.5= NetBSD-1.6[I-T]-*
-_BLTN_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \
- NetBSD-1.6-* NetBSD-1.6_*-* NetBSD-1.6.*-* \
- NetBSD-1.5[YZ]-* NetBSD-1.5Z*-*
-_BLTN_HEIMDAL_0.3f= NetBSD-1.5X-*
-_BLTN_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \
- NetBSD-1.5.*-*
-. for _heimdal_version_ in ${_BLTN_HEIMDAL_VERSIONS}
-. for _pattern_ in ${_BLTN_HEIMDAL_${_heimdal_version_}}
-. if !empty(MACHINE_PLATFORM:M${_pattern_})
-BUILTIN_VERSION.heimdal?= ${_heimdal_version_}
-. endif
-. endfor
-. endfor
BUILTIN_VERSION.heimdal?= 0.2t
. endif
BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal}
Index: databases/sqlite3/builtin.mk
===================================================================
RCS file: databases/sqlite3/builtin.mk
diff -N databases/sqlite3/builtin.mk
--- databases/sqlite3/builtin.mk 20 Mar 2012 21:00:47 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-# $NetBSD: builtin.mk,v 1.3 2012年03月20日 21:00:47 adam Exp $
-
-BUILTIN_PKG:= sqlite3
-
-PKGCONFIG_FILE.sqlite3= /usr/lib/pkgconfig/sqlite3.pc
-PKGCONFIG_BASE.sqlite3= /usr
-
-.include "../../mk/buildlink3/pkgconfig-builtin.mk"
-
-###
-### The section below only applies if we are not including this file
-### solely to determine whether a built-in implementation exists.
-###
-
-CHECK_BUILTIN.sqlite3?= no
-.if !empty(CHECK_BUILTIN.sqlite3:M[nN][oO])
-
-. if !empty(USE_BUILTIN.sqlite3:M[yY][eE][sS])
-BUILDLINK_PREFIX.sqlite3= /usr
-BUILDLINK_FILES.sqlite3+= lib/pkgconfig/sqlite3.pc
-. endif
-
-.endif # CHECK_BUILTIN.sqlite3
Home |
Main Index |
Thread Index |
Old Index