pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bind920: tolerate being built with -fsanitize=thread.

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Wed Mar 26 16:17:30 2025 +0000
Changeset:	b0de78d40e3068fddbc9c92a0fd90beffe53a681

Modified Files:
	bind920/distinfo
	bind920/patches/patch-configure.ac
	mattermost-server/Makefile
	mattermost-server/distinfo
	rust183/platform.mk
	rust184/do-cross.mk
	rust185/Makefile
	rust185/cross.mk
	rust185/do-cross.mk

Log Message:
bind920: tolerate being built with -fsanitize=thread.

Improve config check so that -lexecinfo is picked up instead
of relying on libtsan.so which misses some symbols.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b0de78d40e3068fddbc9c92a0fd90beffe53a681

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

diffstat:
 bind920/distinfo                   |  2 +-
 bind920/patches/patch-configure.ac | 13 +++++++++++++
 mattermost-server/Makefile         | 10 ++++++----
 mattermost-server/distinfo         |  6 +++---
 rust183/platform.mk                |  2 +-
 rust184/do-cross.mk                | 12 ++++++------
 rust185/Makefile                   |  4 ++--
 rust185/cross.mk                   | 24 ++++++++++++------------
 rust185/do-cross.mk                | 16 ++++++++--------
 9 files changed, 52 insertions(+), 37 deletions(-)

diffs:
diff --git a/bind920/distinfo b/bind920/distinfo
index eebe583879..82d77e1e7d 100644
--- a/bind920/distinfo
+++ b/bind920/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.20 2024/07/23 13:50:32 taca Exp $
 BLAKE2s (bind-9.20.7.tar.xz) = 4ce6a03fa14ce219f9fbc792eb9fd5742dc8a0ac8f613444c35c14a004a0573e
 SHA512 (bind-9.20.7.tar.xz) = b9570c0c6588819108017d30dc7fb5e2f34361f941186d29da3d2830bbe3333c8c16bdb6581f5bec4786d90b74db860a9cad5f66d4f1c65168eae69f401a9df0
 Size (bind-9.20.7.tar.xz) = 5655168 bytes
-SHA1 (patch-configure.ac) = f1f672271aa38c10b12d12d48455eb0af82d270c
+SHA1 (patch-configure.ac) = d3b9bb82c8e164135b93a76d5c53ad40521226e2
diff --git a/bind920/patches/patch-configure.ac b/bind920/patches/patch-configure.ac
index ba9ac81d45..2c9cd89d3d 100644
--- a/bind920/patches/patch-configure.ac
+++ b/bind920/patches/patch-configure.ac
@@ -1,6 +1,10 @@
 $NetBSD$
 
 support removal of WRKDIR references from config.h
+Also test a more specific -lexecinfo function, to allow
+configuration with CFLAGS+=-fsanitize=thread, because
+backtrace_symbols() is in /usr/lib/libtsan.so, so the
+"do we need -lexecinfo?" is otherwise mis-detected as "not needed".
 
 --- configure.ac.orig	2024-07-08 13:09:17.034283885 +0000
 +++ configure.ac
@@ -16,3 +20,12 @@ support removal of WRKDIR references from config.h
  
  AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
  
+@@ -975,7 +978,7 @@ AC_SUBST([LIBSYSTEMD_LIBS])
+ # Check if the system supports glibc-compatible backtrace() function.
+ #
+ AC_CHECK_HEADERS([execinfo.h],
+-		 [AC_SEARCH_LIBS([backtrace_symbols], [execinfo],
++		 [AC_SEARCH_LIBS([backtrace_symbols_fd], [execinfo],
+ 				 [AC_CHECK_FUNCS([backtrace_symbols])])])
+ 
+ #
diff --git a/mattermost-server/Makefile b/mattermost-server/Makefile
index e550ea45c7..9aeeb7b023 100644
--- a/mattermost-server/Makefile
+++ b/mattermost-server/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-GITHUB_TAG=	v5.21.0
+GITHUB_TAG=	v5.32.1
 DISTNAME=	mattermost-server-${GITHUB_TAG:S,^v,,}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mattermost/}
@@ -8,12 +8,14 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 MAINTAINER=	bsiegert%NetBSD.org@localhost
 HOMEPAGE=	https://mattermost.com/
-COMMENT=	TODO: Short description of the package
+COMMENT=	Secure collaboration platform
 LICENSE=	mit
 
-GO_BUILD_PATTERN= -mod=vendor -trimpath ./cmd/mattermost
-USE_LANGUAGES=	c # go
+GO_BUILD_PATTERN=	-mod=vendor -trimpath ./cmd/mattermost
+USE_LANGUAGES=		c # go
 CHECK_RELRO_SKIP=	bin/mattermost
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-server//}
+
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mattermost-server/distinfo b/mattermost-server/distinfo
index 2b4179198c..58cc1e4ceb 100644
--- a/mattermost-server/distinfo
+++ b/mattermost-server/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-RMD160 (mattermost-server-5.21.0/mattermost-server-5.21.0.tar.gz) = 57b8e3dec433db126877a0fb82c6ba7212eea301
-SHA512 (mattermost-server-5.21.0/mattermost-server-5.21.0.tar.gz) = 9e09a0ed7c5f9d12871d7009f7dd2b49eaf8ff2657cd9d04212a42d20b217f553326e739122e86ed0525713c6c1f70b118d5f9964c1f1e7f94956596466d186e
-Size (mattermost-server-5.21.0/mattermost-server-5.21.0.tar.gz) = 16785271 bytes
+BLAKE2s (mattermost-server-5.32.1/mattermost-server-5.32.1.tar.gz) = 227693d8d052906d15bf41889f1a77ef753ba2892224ab6717e7cd8d9b81e37e
+SHA512 (mattermost-server-5.32.1/mattermost-server-5.32.1.tar.gz) = e497d95199f018b7557e56f8ef9a51e7b7fe7cba1662ea4ff3120cbc68b4ba40104de376ee903323924de8ed0c0f745cab2888aaecdbabc87d54a3d33c012f9f
+Size (mattermost-server-5.32.1/mattermost-server-5.32.1.tar.gz) = 21723836 bytes
diff --git a/rust183/platform.mk b/rust183/platform.mk
index c6a01214d8..4351b8bd1a 100644
--- a/rust183/platform.mk
+++ b/rust183/platform.mk
@@ -7,7 +7,7 @@
 
 .if !defined(PLATFORM_SUPPORTS_RUST)
 
-# Rust needs NetBSD>8
+# Rust needs NetBSD>=9.0
 .for rust_arch in aarch64 earmv7hf i386 powerpc riscv64 sparc64 x86_64
 .  for rust_os in Darwin FreeBSD Linux NetBSD SunOS
 .    if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-8].*)
diff --git a/rust184/do-cross.mk b/rust184/do-cross.mk
index 36d5cd1a7f..2492bf04f1 100644
--- a/rust184/do-cross.mk
+++ b/rust184/do-cross.mk
@@ -5,12 +5,12 @@
 VERSION!=	make show-var VARNAME=PKGVERSION
 V_NOREV!=	make show-var VARNAME=PKGVERSION_NOREV
 
-SHORT_TARGETS+=		armv7
-SHORT_TARGETS+=		armv6
-SHORT_TARGETS+=		sparc64
-SHORT_TARGETS+=		powerpc
-SHORT_TARGETS+=		arm64
-SHORT_TARGETS+=		arm64_be
+#SHORT_TARGETS+=		armv7
+#SHORT_TARGETS+=		armv6
+#SHORT_TARGETS+=		sparc64
+#SHORT_TARGETS+=		powerpc
+#SHORT_TARGETS+=		arm64
+#SHORT_TARGETS+=		arm64_be
 SHORT_TARGETS+=		i386
 SHORT_TARGETS+=		riscv64
 SHORT_TARGETS+=		mipsel	# produces mips32 (not mips1) executables
diff --git a/rust185/Makefile b/rust185/Makefile
index e8290b1681..c52c99bdf5 100644
--- a/rust185/Makefile
+++ b/rust185/Makefile
@@ -60,8 +60,8 @@ CONFIGURE_ARGS+=	${ADD_CONFIGURE_ARGS}
 # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
 # uncommenting the LD_LIBRARY_PATH setting may be required to run
 # the bootstrap
-PKGSRC_MAKE_ENV+=	LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
-MAKE_ENV+=		LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+#PKGSRC_MAKE_ENV+=	LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
+#MAKE_ENV+=		LD_LIBRARY_PATH=${RUST_BOOTSTRAP_PATH:Q}/lib
 
 # This should allow us to perform "offline" builds (so cargo doesn't fetch
 # dependencies during the build stage) but this isn't hooked up yet.
diff --git a/rust185/cross.mk b/rust185/cross.mk
index 47f2b3e006..deb6283f53 100644
--- a/rust185/cross.mk
+++ b/rust185/cross.mk
@@ -20,10 +20,10 @@
 #CROSS_ROOT=		/u/evbarm64
 #CROSS_ROOT=		/u/evbarm64eb
 #CROSS_ROOT=		/u/i386
-#CROSS_ROOT=		/u/mipsel
+CROSS_ROOT=		/u/mipsel
 #CROSS_ROOT=		/u/riscv64
 #CROSS_ROOT=		/
-#MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
+MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 
 # The GNU cross target designation
 #GNU_CROSS_TARGET=	armv7--netbsdelf-eabihf
@@ -33,9 +33,9 @@
 #GNU_CROSS_TARGET=	aarch64--netbsd
 #GNU_CROSS_TARGET=	aarch64_be--netbsd
 #GNU_CROSS_TARGET=	i486--netbsdelf
-#GNU_CROSS_TARGET=	mipsel--netbsd
+GNU_CROSS_TARGET=	mipsel--netbsd
 #GNU_CROSS_TARGET=	riscv64--netbsd
-#MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
+MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
 
 # To cross-build rust, you need to specify
 # the ultimate target to built for, as well as the
@@ -49,17 +49,17 @@
 #TARGET=		aarch64_be-unknown-netbsd
 #TARGET=		i686-unknown-netbsd
 #TARGET=		i586-unknown-netbsd
-#TARGET=		mipsel-unknown-netbsd
+TARGET=		mipsel-unknown-netbsd
 #TARGET=		riscv64gc-unknown-netbsd
 #
-#SCRIPTS=		${WRKDIR}/scripts
-#CONFIGURE_ARGS+=	--host=${TARGET}
-#CONFIGURE_ARGS+=	--target=${TARGET}
-#CONFIGURE_ARGS+=	--set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
-#CONFIGURE_ARGS+=	--set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
-#CONFIGURE_ARGS+=	--set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
+SCRIPTS=		${WRKDIR}/scripts
+CONFIGURE_ARGS+=	--host=${TARGET}
+CONFIGURE_ARGS+=	--target=${TARGET}
+CONFIGURE_ARGS+=	--set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
+CONFIGURE_ARGS+=	--set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
+CONFIGURE_ARGS+=	--set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
 # Pick one:
-#CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
+CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
 #CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap
 
 # May be required when cross-building on NetBSD
diff --git a/rust185/do-cross.mk b/rust185/do-cross.mk
index 36d5cd1a7f..03c651fe3b 100644
--- a/rust185/do-cross.mk
+++ b/rust185/do-cross.mk
@@ -5,14 +5,14 @@
 VERSION!=	make show-var VARNAME=PKGVERSION
 V_NOREV!=	make show-var VARNAME=PKGVERSION_NOREV
 
-SHORT_TARGETS+=		armv7
-SHORT_TARGETS+=		armv6
-SHORT_TARGETS+=		sparc64
-SHORT_TARGETS+=		powerpc
-SHORT_TARGETS+=		arm64
-SHORT_TARGETS+=		arm64_be
-SHORT_TARGETS+=		i386
-SHORT_TARGETS+=		riscv64
+#SHORT_TARGETS+=		armv7
+#SHORT_TARGETS+=		armv6
+#SHORT_TARGETS+=		sparc64
+#SHORT_TARGETS+=		powerpc
+#SHORT_TARGETS+=		arm64
+#SHORT_TARGETS+=		arm64_be
+#SHORT_TARGETS+=		i386
+#SHORT_TARGETS+=		riscv64
 SHORT_TARGETS+=		mipsel	# produces mips32 (not mips1) executables
 
 # Conditional local overrides of ROOT.* variables:
Home | Main Index | Thread Index | Old Index