From nobody Tue Apr 11 23:04:24 2023 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 4Px1cm3Jnkz44lYq; Tue, 11 Apr 2023 23:04:24 +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 4Px1cm2H5xz4Hhf; Tue, 11 Apr 2023 23:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254264; 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=I+IRdPQ3FOnMfebQsA43Ilz3l1eOSoO6Npmb9fMPdww=; b=g77Pq/hGi/Qf5kLyZoaRWZu6iFO3M6m5jNjDkCFLE3BuRHXCEEfTHh2y1sKU4UVYmh6pPR RZpiYKiCiAS/hUDFvnX9DQ9KzL4nOeoRry4jwssJy5TLyNkupHaGkWyQHlQx9vaIrdrbf1 FqW9dv9YhPX9iPwT+pLDfXukC5xWxn/wgVdYWW3WzpyEF5HCYJaTOliK+lIqZOE8Wj9Rhe a9OLgq0/tPW/uiCJSAP+Urnl01t2+2vCOhGF1rFA41E/zOoO1ZWen+RjVm2XM4MyE1yeVh BtoASDLGur+/whUSeShLgzTSNg3RQBZsqm9TagEM7ZGYtXo03mHAQflvw/XV+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681254264; 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=I+IRdPQ3FOnMfebQsA43Ilz3l1eOSoO6Npmb9fMPdww=; b=BZef72V4qU0xn5FDLeYtyPfjvBDGbknbo2JToihs4LNYxrQ5zSeA0Trra7ZpnBeu3xNh67 Yf7x2wWDqvzVmPYwl8Qy5k+FQKyd+hhvOuA83PBn8Ilk15ruMYw4HbHyvddhOHKKCvw57L /z8pNPaIsPFY6Tg2M1ia06XZnNws9mvELRYcQzPKVzuHBhUZ1qJXAiJg7u0wlDcW2wzL8q 07ldU6ELmzNqraT1ZeL+tgWb2F6SlHYVXe4Sj4nqgmKgs+PErRjGobG5CtyQbWLrIEARJZ LDE7h8LFB58puzP4EoOGuXDiO/DvtGCJyZZWsagxZuNiavT1na+Rj+jKtSvGjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681254264; a=rsa-sha256; cv=none; b=i2c7iOlUFG88UvyEXFEqsoSvRcWzD8rbSzmt973WXHhOqF9CJ1ATJSj9koOtdbqo887cIS 6PVf6UymhGY4XFIunSjCdlSs7wQZnEXru8wnbvZRNEIQ/kxNBZHSWpuxqpNV3zagqQU2eF kbqc48Rokx6XQvxoy3sKIjP/cPO1/jf+9fsV1Fm1omm8YA/pvG2lExPUmEHF31eEE2Qjm8 kA4VZLQb4gfdptCNRxRSmDAVAmgFdM4Aw/hkFEYcIztBcxjBXR6Y25UrfAXE2hpHxTtLQR Wz6gQjgZhLPBWQj7NLWjZWHjn10YJ2eprCymnE2QvvC0bec7N1V8DJZTSDOIHw== 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 4Px1cm1NDvzc5t; Tue, 11 Apr 2023 23:04:24 +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 33BN4OE3071956; Tue, 11 Apr 2023 23:04:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BN4O9k071955; Tue, 11 Apr 2023 23:04:24 GMT (envelope-from git) Date: Tue, 11 Apr 2023 23:04:24 GMT Message-Id: <202304112304.33BN4O9k071955@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: da38f7128609 - main - science/minc2: fix build with -fno-common 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da38f7128609fddf5240744354097f9eda5ce92e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=da38f7128609fddf5240744354097f9eda5ce92e commit da38f7128609fddf5240744354097f9eda5ce92e Author: Robert Clausecker AuthorDate: 2023-04-11 00:39:34 +0000 Commit: Robert Clausecker CommitDate: 2023-04-11 23:02:43 +0000 science/minc2: fix build with -fno-common Move the definition of two symbols from header to source file. This fixes the build on FreeBSD 13+. --- science/minc2/Makefile | 5 +---- .../minc2/files/patch-conversion_minctoecat_ecat__write.c | 12 ++++++++++++ .../minc2/files/patch-conversion_minctoecat_ecat__write.h | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/science/minc2/Makefile b/science/minc2/Makefile index 4d3ae192e619..60f4ed80542d 100644 --- a/science/minc2/Makefile +++ b/science/minc2/Makefile @@ -1,7 +1,7 @@ PORTNAME= minc PORTVERSION= 2.2.00 DISTVERSIONPREFIX= release- -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= science biology PKGNAMESUFFIX= 2 @@ -13,9 +13,6 @@ WWW= https://www.bic.mni.mcgill.ca/ServicesSoftware/MINC LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: matrix_errno -BROKEN_FreeBSD_14= ld: error: duplicate symbol: matrix_errno - LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf RUN_DEPENDS= bash:shells/bash diff --git a/science/minc2/files/patch-conversion_minctoecat_ecat__write.c b/science/minc2/files/patch-conversion_minctoecat_ecat__write.c new file mode 100644 index 000000000000..4369323f90d8 --- /dev/null +++ b/science/minc2/files/patch-conversion_minctoecat_ecat__write.c @@ -0,0 +1,12 @@ +--- conversion/minctoecat/ecat_write.c.orig 2023-04-11 00:36:34 UTC ++++ conversion/minctoecat/ecat_write.c +@@ -11,6 +11,9 @@ + #define ERROR -1 + #define V7 70 + ++MatrixErrorCode matrix_errno; ++ ++char matrix_errtxt[132]; + + char* dstypecode[NumDataSetTypes] = + { "u","s","i","a","n","pm","v8","v","p8","p","i8","S","S8","N", "FS"}; diff --git a/science/minc2/files/patch-conversion_minctoecat_ecat__write.h b/science/minc2/files/patch-conversion_minctoecat_ecat__write.h new file mode 100644 index 000000000000..902eafc23a84 --- /dev/null +++ b/science/minc2/files/patch-conversion_minctoecat_ecat__write.h @@ -0,0 +1,14 @@ +--- conversion/minctoecat/ecat_write.h.orig 2023-04-11 00:36:27 UTC ++++ conversion/minctoecat/ecat_write.h +@@ -39,9 +39,9 @@ typedef enum { + BitData + } MatrixDataType; + +-MatrixErrorCode matrix_errno; ++extern MatrixErrorCode matrix_errno; + +-char matrix_errtxt[132]; ++extern char matrix_errtxt[132]; + + typedef struct XMAIN_HEAD { + char magic_number[14];