From nobody Sun Apr 28 07:10:17 2024 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 4VRyK56Ltwz5J7hb; Sun, 28 Apr 2024 07:10:17 +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 4VRyK524FVz447W; Sun, 28 Apr 2024 07:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714288217; 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=zi2iSDJ3ZpnyULM1CrG9LNZFv1R0ZqtxwibOL0/s+Wg=; b=XYd79ZWwxnkU3Bd78l/U4y+4hS0cb1iMncXakxaEzmOmwelPE5MdWro/sECpKpQX+T5MWN 2F2pDHH3I1ak6E4fEbVCfzC22AykGVmMzzZjhppRPhkleX3de+NBD43Us2YflBvvZtDBHM iZQ4lZ1fnjhXcY0NiSDkMexa/WLMFW5sUK1Nn3lWcmlSt9wGxMlzXmXuvpydftoIbBynuo OESmLb1AIthSW8sYvNuVgYBypjwTZL0rsTKAETexobEj0EhHcQ/cAABaXo0KkFWqa6Ctj7 LdqjQwsvYt2AOPeeqNId4nA0jOUlvgvmOTYcekFvE6DGikD+T71jN65NbCOhzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714288217; a=rsa-sha256; cv=none; b=LEz8V8LaX/ibyFtnMKGSPn3CTNf0puVNXSIpxcNJeWNc0Sm/PmiuNytBs5Vpl/1Vyy1jlR XV+Kctqz+az5jTmKHh+9oGGJQe85Bi2/mznoUmCMWjTLCYmmz5lsjBQzXXwT7+LQwveSpB vr5eAErwcoN3UqtzF2ytRb8DOQQRArQnjuOuYNI1IIZfHAWWS/NGA4sIS7GRz7waWd0gWl 37r21rkfupamY+RD/thqrtmG+nRozaSNMkzFBMgkkFmMG/5YJbSyAEvYOwO+lV4OpnyEkq y7pXiWIibZr8zXvWTdcU5e90oontJAwFuJ+nT5ZqN6ujpZYEvUHw18YuoOkLDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714288217; 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=zi2iSDJ3ZpnyULM1CrG9LNZFv1R0ZqtxwibOL0/s+Wg=; b=U6sa9mGDXfPDS0ELmXEvMQSNfma1lyPkcy/YmtTwaiHlgRZJlEsUt0JWvkQlQkEi2Gb26k 6GAdg3Sv6MHkYRmua8srZuiCFBxAQ5Z4ROOoRW/aRqGL6h9FqB+boXk++Ai7dLlkjzZkCX KzjWAHA+t2an/AqYZ9XLBLr1UYlV6X3mD7K0iIE9bxvIFoq9MKs9G5LApE5lkpDg6gk5ke tVUQrbo0uEBEuqpLTOCBwrYzbpN5JB2e4FlWA9SxyKsatbFxmb1ykBdpQ1FXhve68ztiyl lDlNunqcxhINvfBssKTPrC+JJL+CXzrSt6Hczw0qnobA3DKUbz7qdjIgAHxoVQ== 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 4VRyK51gxHzG6g; Sun, 28 Apr 2024 07:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43S7AHTR081961; Sun, 28 Apr 2024 07:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S7AH9U081953; Sun, 28 Apr 2024 07:10:17 GMT (envelope-from git) Date: Sun, 28 Apr 2024 07:10:17 GMT Message-Id: <202404280710.43S7AH9U081953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 67dfb32b6e2b - main - biology/ngs-sdk: Attempt to fix build on i386 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67dfb32b6e2b08ac632d3b30b6e24d4caa78ce92 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=67dfb32b6e2b08ac632d3b30b6e24d4caa78ce92 commit 67dfb32b6e2b08ac632d3b30b6e24d4caa78ce92 Author: Yuri Victorovich AuthorDate: 2024-04-28 07:07:25 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-28 07:10:02 +0000 biology/ngs-sdk: Attempt to fix build on i386 Reported by: fallout --- .../files/patch-ngs-sdk_setup_konfigure.perl | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/biology/ngs-sdk/files/patch-ngs-sdk_setup_konfigure.perl b/biology/ngs-sdk/files/patch-ngs-sdk_setup_konfigure.perl index 5fc8fb532a2c..3d4ce73cdafd 100644 --- a/biology/ngs-sdk/files/patch-ngs-sdk_setup_konfigure.perl +++ b/biology/ngs-sdk/files/patch-ngs-sdk_setup_konfigure.perl @@ -1,6 +1,9 @@ ---- ngs-sdk/setup/konfigure.perl.orig 2021-08-18 16:26:23 UTC +- patch includes removal of '-arch i386' trying to fix build on i386: +- see https://github.com/ncbi/ngs/issues/39 + +--- ngs-sdk/setup/konfigure.perl.orig 2022-11-15 17:37:36 UTC +++ ngs-sdk/setup/konfigure.perl -@@ -225,7 +225,7 @@ if ($OS eq 'linux') { +@@ -225,7 +225,7 @@ println $MARCH unless ($AUTORUN); print "checking machine architecture... " unless ($AUTORUN); println $MARCH unless ($AUTORUN); @@ -9,7 +12,7 @@ println "configure: error: unsupported architecture '$OSTYPE':'$MARCH'"; exit 1; } -@@ -312,6 +312,8 @@ my $BITS; +@@ -312,6 +312,8 @@ if ($MARCH =~ /x86_64/i) { if ($MARCH =~ /x86_64/i) { $BITS = 64; @@ -35,3 +38,20 @@ } elsif ($OSTYPE =~ /darwin/i) { $LPFX = 'lib'; $OBJX = 'o'; +@@ -386,14 +398,14 @@ if ($TOOLS =~ /gcc$/) { + my $versionMin = '-mmacosx-version-min=10.10'; + $CP = "$CPP -c $versionMin"; + if ($BITS ne '32_64') { +- $ARCH_FL = '-arch i386' if ($BITS == 32); ++ $ARCH_FL = '' if ($BITS == 32); + $OPT = '-O3'; + $AR = 'ar rc'; + $LD = "clang $ARCH_FL"; + $LP = "$CPP $versionMin $ARCH_FL"; + } else { + $MAKE_MANIFEST = '( echo "$^" > $@/manifest )'; +- $ARCH_FL = '-arch i386 -arch x86_64'; ++ $ARCH_FL = '-arch x86_64'; + $OPT = '-O3'; + $AR = 'libtool -static -o'; + $LD = "clang -Wl,-arch_multiple $ARCH_FL -Wl,-all_load";