From nobody Fri Aug 25 04:59:54 2023 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 4RX76f6QMjz4qpkN; Fri, 25 Aug 2023 04:59:54 +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 4RX76f4RtJz3KGK; Fri, 25 Aug 2023 04:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692939594; 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=SRLeHDkLYCTYUk/CfCck+DcIslBJMA/6Qw84/G6yo8E=; b=cI64rRCyUge3AB2aJND3oGDhlCKHEcPjcFAl0vIBqZ/CVJjCST0sfYKyILtJUkInTbvPo4 XeZY4li9FAAUT0pZG6oDEdix47oztcfuKhUKwXUo6CuckSxfdKzC1MJFkv8EdRgBi5jcrv 4wRrcje0Hl15cs94l4gleGYT4zH+bWtQBbg7ZClvnJ9fx3WkFfkymhlE14b+l+JVGmquX0 X+BwYuD836+krrhnuIG5OBIJYCvgBw6E2lpdpBodGZprYoXdh+l8PFCauoLxGdLL0Ni4UH 8DkLpbr5HVnDTBd8ejb/LlSULIiBkWB4ZhctPmOpV7P0xmY6qnUXZNW0K2tJvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692939594; 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=SRLeHDkLYCTYUk/CfCck+DcIslBJMA/6Qw84/G6yo8E=; b=DH28yPDkB/eAm4cH7FBG1cYgPR8MxwNGZYRBZbQ7F1mz9AC/gSrv/9AsGFfm5V/uGmggVE AQWe0TC5IaLMJKg2rn60xbwB55Az5uHl7LeszsSFl7FArQ1E0EUDSxtdpX136my49gKfT7 cBg9Sm+YR0mUGxnpwkKLCqe9qtRKj3t9FG1tY9eFuWuKHFumNWAU6xnaMSS9B3LI/ce8X+ rqtsySBVwD/jF5NMgk8H3yAIk8D4L69ysWa4qtv8/EwVE0+zXDdwkA0yR5fGVteM+/4NjV IQC5G5e+X/EhfmLMnQxohyAXbeUTXzL2e+++9ighjX0s18As6p1dXJh9NwtY8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692939594; a=rsa-sha256; cv=none; b=ahwBzUJDDZiFYUalmY4NxVv+yPShxsMLpKzpN/vVNzvrxFi7hNWESzfYwASuLD/vcSpqll Jv3OVYHldcgBDJFBpBCVu+/el6Nn2TfwsfkeokF7Et9nPYK9o8ruyL2483z88+0dPZTt10 dxtClY2QBN3dyv+BW7cWbkfXlIcCKoIX+ZPvxPWlj/8A9PzFTCftIn36hVr9aqFGTi6UAf Of0L+xMHLDx3fMaXZXUm0z6DDWDsI6C7VDlTObcdTq8WcJM+gIlhH3R9sktJyvBHoEefiz 11vR4kJMkJC9dXgnEkimA4sSpT8Gu++lJlhkCid1sadpEIsXCA/Z80AcdTboHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RX76f3Y1bzvr4; Fri, 25 Aug 2023 04:59:54 +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 37P4xsQv040592; Fri, 25 Aug 2023 04:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P4xsmZ040589; Fri, 25 Aug 2023 04:59:54 GMT (envelope-from git) Date: Fri, 25 Aug 2023 04:59:54 GMT Message-Id: <202308250459.37P4xsmZ040589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 1e5fcc42f19a - 2023Q3 - science/tinker: Fix build on non-Intel architectures 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 1e5fcc42f19a527eadbc13874757a1746362f3a5 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e5fcc42f19a527eadbc13874757a1746362f3a5 commit 1e5fcc42f19a527eadbc13874757a1746362f3a5 Author: Yuri Victorovich AuthorDate: 2023-07-18 13:55:24 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-25 04:59:51 +0000 science/tinker: Fix build on non-Intel architectures * add NATIVE option * rename option SSE into SIMD and not make it default Reported by: fallout (cherry picked from commit 812c99755d385807b720cc36e4500b7911db4833) --- science/tinker/Makefile | 16 ++++++++-------- science/tinker/files/patch-make_Makefile | 9 +++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/science/tinker/Makefile b/science/tinker/Makefile index 139976dfc474..72b6a296d2c6 100644 --- a/science/tinker/Makefile +++ b/science/tinker/Makefile @@ -1,5 +1,6 @@ PORTNAME= tinker DISTVERSION= 8.10.5 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= https://dasher.wustl.edu/tinker/downloads/ @@ -29,16 +30,15 @@ SUB_FILES= pkg-message BINARY_ALIAS= gfortran=gfortran${GCC_DEFAULT} -OPTIONS_DEFINE= OPTIMIZED_FFLAGS DOCS EXAMPLES +OPTIONS_DEFINE= NATIVE OPTIMIZED_FFLAGS DOCS EXAMPLES +OPTIONS_DEFINE_amd64= SIMD +OPTIONS_DEFINE_i386= SIMD -OPTIONS_DEFINE_amd64= SSE -OPTIONS_DEFINE_i386= SSE -OPTIONS_DEFAULT_amd64= SSE -OPTIONS_DEFAULT_i386= SSE +NATIVE_MAKE_ARGS= PORT_SIMD_FLAGS+="-march=native" -SSE_MAKE_ARGS= PORT_SIMD_FLAGS="-msse -msse2 -mfpmath=sse" +OPTIMIZED_FFLAGS_DESC= Fortran compilation optimizations -OPTIMIZED_FFLAGS_DESC= compilation optimizations +SIMD_MAKE_ARGS= PORT_SIMD_FLAGS+="-msse -msse2 -mssse3" PORTDOCS= * PORTEXAMPLES= * @@ -50,7 +50,7 @@ FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops .if (${ARCH} == "i386") FFLAGS+= -mfancy-math-387 -malign-double .endif # i386 -.endif +.endif # OPTIMIZED_FFLAGS post-extract: @${RM} ${BUILD_WRKSRC}/*.c diff --git a/science/tinker/files/patch-make_Makefile b/science/tinker/files/patch-make_Makefile index 5f647f400faf..4781c07cc428 100644 --- a/science/tinker/files/patch-make_Makefile +++ b/science/tinker/files/patch-make_Makefile @@ -1,5 +1,14 @@ --- make/Makefile.orig 2023-03-09 06:01:09 UTC +++ make/Makefile +@@ -87,7 +87,7 @@ APBS_LIBS = -lapbsmainroutines -lapbs -lmaloc -lapbsbl + F77 = gfortran + F77FLAGS = -c + #OPTFLAGS = -Ofast -march=native -fopenmp +-OPTFLAGS = -Ofast -mssse3 -fopenmp ++OPTFLAGS = -Ofast $(PORT_SIMD_FLAGS) -fopenmp + #OPTFLAGS = -Og -fbacktrace -fcheck=bounds -Wunused -Wmaybe-uninitialized + LIBDIR = -L. -L$(TINKER_LIBDIR)/macos + LIBS = @@ -818,136 +818,136 @@ listing: cat *.f *.c > tinker.txt