From nobody Wed Jul 19 18:26:09 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 4R5km220Q7z4mvZc; Wed, 19 Jul 2023 18:26:10 +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 4R5km20QrNz3j5y; Wed, 19 Jul 2023 18:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689791170; 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=y5JEow8lyhhDBXkMzIB9DA+IXiPN5hZy1QeW7ozK8Ec=; b=dl3AY887s6784yu5DjT1G3FCLauCQwW2wwVfNBWXGcdsL1hTubZJoVTfLw+kGAF0j4yann BHG3YaATV9HYI+LmpMkc8vSUwy+WcVIjeIuvEHNVdUOjj3Bf1xUSeU7JBnLMIzKHbiXscG G5yz9AJEywG+AdvW0DDqauKi9ozrm4P0y/5dFhbaJZGJh7l9asKnXYa1akX4jkVZgycuW1 I8hL5PgO5ZLzLiV7reGusCgofJCJ9E4ncxu/mMLvs44LjuaW6Vcbt+ZQaIho8wHaMo22IU p7PueL2h1Hi11PqVFUVK5ylO94GJpQ2Zf04TRcenjBlQTF0vUdajL6x6RiSB2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689791170; 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=y5JEow8lyhhDBXkMzIB9DA+IXiPN5hZy1QeW7ozK8Ec=; b=u8AeDIyMjvynVBNihEeCkTAZEbgYe1jXNinADuEX/OdLhVflkEM3VPKqPT0wMc9NU5gYbk TZLRdaR9EbqBWz6Dm3+EFcnQUxeHgGmgMq/NkLKdjxiy0rt8G0OVCgaOv6vAeSJjduTXzB vWpFbrU6gDwOxjOr00jncOgGr0o5n+Lp+ybiBOZ2S8Fio7A/A/QFr2/NV5oKztzAhAOEX8 sOv8+IsZFN8ftVNtBtnd4gWNMZCuggLdN7rk6ifykMzsfhVY8QvF6uRR0hzuFeeowNi+dd 7MupVrCJQR2PCpYxMbcd/sGCxHCU//7jUr9vIRmXfnI0bSx6MQuqxmmU1XJTmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689791170; a=rsa-sha256; cv=none; b=MWMXzTaOVvgwLW6Epzk5Vip53s93Bvdv1DEGGdv9YW1gipC0trUOzIchGKBW+n3DPnbump 7sCOueLtEvQgBrMyj32XueJsnc+7vxPWAtQML7Cjzn8v2qjr4g8SNRAY0AthxTvMsMBAHc W7M1phyji6JpU3CJt7ihdSVtqpfjXvuIMlUbrvLgs2gAkAZklAqL0SfMpFd0HMVl3kzoiL 3PZkK93dRSlijBNlXBRdNAk60lVZhL8+QOTuMjNo0AFddcGeHJwbs3n7SIF+rYe/4sw4sW iNqm2eMBFAYmUASHl9p96Rcn6ceJbLyZR1eMbyxtBEmohxlamCylY0jsyZnjWA== 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 4R5km16GgKzyh4; Wed, 19 Jul 2023 18:26:09 +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 36JIQ9ji016765; Wed, 19 Jul 2023 18:26:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36JIQ9Pa016764; Wed, 19 Jul 2023 18:26:09 GMT (envelope-from git) Date: Wed, 19 Jul 2023 18:26:09 GMT Message-Id: <202307191826.36JIQ9Pa016764@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: 812c99755d38 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 812c99755d385807b720cc36e4500b7911db4833 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=812c99755d385807b720cc36e4500b7911db4833 commit 812c99755d385807b720cc36e4500b7911db4833 Author: Yuri Victorovich AuthorDate: 2023-07-18 13:55:24 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-19 18:26:05 +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 --- 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