From nobody Sun May 08 07:34:55 2022 X-Original-To: dev-commits-ports-all@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 655411AC51BD; Sun, 8 May 2022 07:34:56 +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 4Kwx0J1Bj0z3pJy; Sun, 8 May 2022 07:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651995296; 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=9OU5S6rPs9EmOzbWr3RmWKT1IjNnazCTxtox9QlaoS8=; b=Xqy55XltmFYdqnf/MedpDzi0qseWyiqDM9xg538KbO/J5/WQzoi6MZFoH+j/B8t059RP/d dmf1ZDw1vDxed5hwFuomF5d38qdJvpTEwQpv+hCGMETkdfRG7L+U9TkzZSu134nQlkkUdp cEMQGgd6L4+NguoTVshVmUIzwGWbRSvEt51crQ7Upw14uTKxFfO/3S0Ek9Can2zlhJtqiz eBd49uXd9ZjjAXD0gp4YqKYdXowX8kBgNDSTsS7F55MWbhaT1rkF2gA84E9mpIrufYvuEg rbdT8dp9Ih6+7EYYxWxipcP5wVd0PNRvgZ9FzYES4cOcQjhiOD7guGg6xbxFPQ== 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 0569B20A9D; Sun, 8 May 2022 07:34:56 +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 2487YtJO085354; Sun, 8 May 2022 07:34:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2487Yt47085353; Sun, 8 May 2022 07:34:55 GMT (envelope-from git) Date: Sun, 8 May 2022 07:34:55 GMT Message-Id: <202205080734.2487Yt47085353@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 4a22b45b87f6 - main - net/iwnet: attempt to fix the port's build on -CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a22b45b87f60f58577dc99cbaaf6a7351188573 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651995296; 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=9OU5S6rPs9EmOzbWr3RmWKT1IjNnazCTxtox9QlaoS8=; b=bmxj+Whw/QYWXmsY/cHZ0jEBmvdteNvdXdanMSPbjcLIyLbnPGgjUFwth2+HlkBlrdDHKC jwPlYvi4YnW/mVi2Zg4/b6sgupJ4i/SIEyP+A7qb/YBnXQwDApaYKSPoDeTG/J4kn8aMaK CYsejddCUUljBFw2hGrvVJhLFTGpzRqibT3S2XHTp1KB4OiPhJW9YfU5koY54B6t6B/4d7 hdAgvVQM4axRPbnjDG4DiFYNfaSijCkOcmzjlRapYlbM70MoXh7tQhToVwJsyaKTT+KyMG g46xrCojB9OWYzeFaPIMrQtgyHa9I6M5ZUWDVglk29juAfWxiH4C/qrXEp7eZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651995296; a=rsa-sha256; cv=none; b=v07zT+6J3Rf8eszv+1V/uWDVr4wwOcB4dsc+861sJH+vBi75ezD6k4f3NcYtPKHxz80tLw on/KJlsa53yA2JkKPgpsVrkflQ9pQtfy2puRk18L0L/rizQXXghCxGGpsZMgfri2CpAvl+ PDWaJ7ulEXpuJqwnyvbDHhdudMKmPXVhJqfF37pQBOythpKfZdNCPlF0CyFwev15sUKQJ6 KBG2ntqCvWqhrj3OeTwqbgyzoRelqdcqpKX/fDsboKRKUJktFhKgBnym7/YmLtcq/8cJxP baP+O1nne5PouqHSSqu8l4Labja97VAKwtuqh5au4rxnMMNbigRcmQPMREIVjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a22b45b87f60f58577dc99cbaaf6a7351188573 commit 4a22b45b87f60f58577dc99cbaaf6a7351188573 Author: Alexey Dokuchaev AuthorDate: 2022-05-08 07:33:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-08 07:33:58 +0000 net/iwnet: attempt to fix the port's build on -CURRENT Lack of MALLOC_PRODUCTION exposed forgotten uninitialized pointer in hash table generator which caused segmentation fault during the build. Pull another upstream patch which might mitigate the races of CMake's custom commands. While here, don't forcibly insert our CFLAGS, they would get appended at the later stage automagically. Reported by: pkg-fallout --- net/iwnet/Makefile | 6 ++++++ net/iwnet/files/patch-src_CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net/iwnet/Makefile b/net/iwnet/Makefile index b16a0ea17c25..373f7345cb8e 100644 --- a/net/iwnet/Makefile +++ b/net/iwnet/Makefile @@ -22,6 +22,12 @@ CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTS:BOOL=ON OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e '/USES_TERMINAL/d' \ + ${WRKSRC}/tools/CMakeLists.txt + @${REINPLACE_CMD} -e '51s:malloc(:calloc(1, :' \ + ${WRKSRC}/tools/mimegen.c + do-test: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} diff --git a/net/iwnet/files/patch-src_CMakeLists.txt b/net/iwnet/files/patch-src_CMakeLists.txt index dce86d7fd320..32642169582c 100644 --- a/net/iwnet/files/patch-src_CMakeLists.txt +++ b/net/iwnet/files/patch-src_CMakeLists.txt @@ -5,7 +5,7 @@ "${CMAKE_C_ASAN} -O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG -Wno-unused-variable" ) -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -O3 -DNDEBUG") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_ASAN} -DNDEBUG") ++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -DNDEBUG") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g") set(CMAKE_C_FLAGS_RELEASEWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})