From nobody Sat Sep 17 10:57:57 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MV7Ff0741z4cNfn; Sat, 17 Sep 2022 10:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MV7Fd6hklz3tDB; Sat, 17 Sep 2022 10:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663412277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kaEjrcX0aLrqDhBl6saHcDfTPxUZeaoga/4Xb9B8lo=; b=B9+Ej7s60tnl191TdyRvkxZ5j7I3nWCy2VjDHxbzGSOndsgWNbQiov04vyQbtRP7yyy0HD IsYUQbiHeVtYJU/EK+kAVMWF5pdYCYldbj5jBroZvHM7bYljLAQTrytamJgsZ80IySxElK 2pqv6FtI9jAbNQs4rJ18BPQuBqQN8cLBl2BZR9noeNS/wWVqFqLmuRQxCXOiLTHDbPegd2 T0USATuBwFarBCiP9jMlamhu5A1lELRo4FoKFrtWKQmDd4R533vdUf/T8jCnJbxbUTOiCd nkv3m1WyyzESqkMv1i44LtZVcGwEe6IG4MX5lL0j3FTIbqRil2dikFKWeDhFEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MV7Fd5W5dzgnM; Sat, 17 Sep 2022 10:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28HAvv8A014453; Sat, 17 Sep 2022 10:57:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HAvvm7014452; Sat, 17 Sep 2022 10:57:57 GMT (envelope-from git) Date: Sat, 17 Sep 2022 10:57:57 GMT Message-Id: <202209171057.28HAvvm7014452@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: bdc2b54bd1d9 - main - lang/zig, lang/zig-devel: fix for CMake 3.24 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdc2b54bd1d909666e6970e6464b892eea67aa3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663412277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kaEjrcX0aLrqDhBl6saHcDfTPxUZeaoga/4Xb9B8lo=; b=yY7W+zwwZmeV8E24TahnBXyuGbrG+Fk3CYRw3fjHTw0VMEuh/1HDFJ5sR1wGoel3iyPLNh f4ZFYEw9ODNk3PNlgZtFNoHBG7NNnhANwgZLXcGc+K2Ygh81Zz7yPQl79pQzqjczMCq0Jm 8nqEvk84ecor9yKFMUeZi3CUVh+5FOoVBo8UGvbc9fNQyd63m9iRM0xZmXO1Rpbt4r04sR zj9zSAvfa/qcCDrgw9tvlGvHNO6/FsWG+wW0KU224or5GCP+nVkWmmFxYG7mUqr3wv1vWJ BVKtDwn8mMnDUDsTBL3CXUYuFggzK9fUnaoiQOs8KcDbu2f80A4LQ+4casmK3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663412277; a=rsa-sha256; cv=none; b=rFlc3exrIPlMpjf0KlsrwsiGcsz70FUq8Eas4Db6N2RNjG82oyTc13+F7Ezi78hNbOIpqK vi1enQyGWhKmHgyDo4esB+jLZGhedZgt0rUNt9AsMfgQGj4/B6ZIfpaafNaOnlfL5dosZp FjhN3O1a7Hi4bA/dLvpQEpiQfWHSkg6LEyu7ryhOS2I4XhMjleu4iJPbZ8UaC0TYEfVYRI mTbURCmCLMP9k1ly05Lvv6E6CM2f7kVLWJR4ngFKqp7/GhEdCl6WA7t3iCA75mcQ+qarVj bmF5DbXQ76JZFshI2YYf/xbURi5XXNLFp32jDANSQe3BWhDBGWB/zIIhBikb9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdc2b54bd1d909666e6970e6464b892eea67aa3b commit bdc2b54bd1d909666e6970e6464b892eea67aa3b Author: Adriaan de Groot AuthorDate: 2022-09-16 22:37:06 +0000 Commit: Adriaan de Groot CommitDate: 2022-09-17 10:56:01 +0000 lang/zig, lang/zig-devel: fix for CMake 3.24 Add the THREADS_PREFER_PTHREAD_FLAG explicitly for zig builds; these are the only two ports that need that, otherwise it would be a candidate for adding to our platform CMake flags. Without the flag, CMake 3.24 changes how pthreads are searched, and it ends up leaving out the -pthread flag from the compile. For zig, this causes the bootstrap compiler to crash immediately (it does not even reach main), which kills the build. Prior to CMake 3.24, this flag already existed, but the order in which pthreads were searched was different, and we ended up using the -pthread flag anyway. The PR is for the CMake update. This was the last blocker for it. PR: 265652 --- lang/zig-devel/Makefile | 3 +++ lang/zig/Makefile | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lang/zig-devel/Makefile b/lang/zig-devel/Makefile index 61264aff72f6..f1ab152699f9 100644 --- a/lang/zig-devel/Makefile +++ b/lang/zig-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= zig DISTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \ https://ziglang.org/builds/ @@ -32,6 +33,8 @@ STATIC_RUN_DEPENDS_OFF= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} STATIC_CMAKE_BOOL= CMAKE_SKIP_INSTALL_RPATH ZIG_STATIC STATIC_LDFLAGS= -llzma -lm -lmd -lxml2 -lz +CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG + _LLVM_VER= 13 _ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig diff --git a/lang/zig/Makefile b/lang/zig/Makefile index d23b5b56c8d9..860013d5bff9 100644 --- a/lang/zig/Makefile +++ b/lang/zig/Makefile @@ -1,6 +1,6 @@ PORTNAME= zig -PORTREVISION= 1 DISTVERSION= 0.9.1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \ https://ziglang.org/builds/ @@ -32,6 +32,8 @@ STATIC_RUN_DEPENDS_OFF= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} STATIC_CMAKE_BOOL= CMAKE_SKIP_INSTALL_RPATH ZIG_STATIC STATIC_LDFLAGS= -licudata -licuuc -llzma -lm -lmd -lxml2 -lz +CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG + _LLVM_VER= 13 _ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig