From nobody Wed Nov 6 15:21:10 2024 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 4Xk86t3wgGz5chdg; Wed, 06 Nov 2024 15:21: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk86t2BNRz4Hp5; Wed, 6 Nov 2024 15:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730906470; 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=8d6EcyKwFKU2nnalUuZ1/L6RgP7JPKCjv7aOg8n2wjc=; b=NGE0a1PHCmD7YlX/H/tVpmnJdfs/pCg4t7OnqMSOwoeu4EkYJd/+dd7pgiWps2NHyBBp/E a0TYFg+XXSwCByxt80VSxkRUtT2WIUUa0k0NC/6ijd51nyB5i+FMUTM8RMBElrzpxWMPpZ UzvMM4xQcRax5cQotMYl/35xFvNyZlKsGHbiVwrAHwNl7WRveBH/ng5zw7IFiBEP37Dh9W VLf1oOURSoBn3ysM0WLVo3WaCTlYTUXFwsyxJtrmKG4DuESCDNGXKT+bVeRfXWjEqquJbD KjpjizYio7tBqJgLOhA9fNXprIIAitUNIVagEZQSx6SRTIJADKGJwD/S32kVKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730906470; 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=8d6EcyKwFKU2nnalUuZ1/L6RgP7JPKCjv7aOg8n2wjc=; b=xLJH84PIuWCzOqnmeSUnP88SbfeV9AmNM4CMU5pInzIuDXO0Me7lIwgmcHmVO+j9LYnN1c KxjsxZ6BiytD4umxZcZmSFfLr48iJXn9vhNHznW/MoleDs3VMoLiTAsfl6KeEzsml1uGn9 WDAxE5pvqxsuGYnci3If7QOGI57ks9woYuWk5CgsegjaSVgQ2WEySN+ZumfGAXBO8by5ey R6esFFkKCJSXJwGGIiMOjmd+qv5IXmbbo2udN81XGTeHzmYpDnjOqTqYYHbmxdWoy1vSaz AUbTS45s8LbswGIC/4KfRrhARshqBk8PUDSBf8w3SUBOqD6Fw6WiLK+u02rz3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730906470; a=rsa-sha256; cv=none; b=F9apye/YsxnPc+5nilECLovETAtModhiX1wm18TcCL3mODF8uQ/YIqxBff5atrJ2vXjmUf KXSKdmnN5633BLPFJ8ZBb4PQqztlYkoLYbEkZWiOoAn9r3BE8Z6o+byMv1Zub3YUoHzr8V KGhalEp34cMpp7l7qsnVPFvN2lNGaqTylX43vtEPoU0mCQCKkgYOBq9c6bqJOs/RSqjYTs 6aLEkLVWEdeAhC9PzKXU8KA5U1+gkEmbRVO7w7S3jy12GhYpbaufT15aYPTr78tuklNviR MiLFs8C9k4DIoQyni7jz61Cra0R5HgBL0knGl8Zctml5IZHrf6Iy1ojCC83xPA== 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 4Xk86t0rmXz15c6; Wed, 6 Nov 2024 15:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6FLAhf054834; Wed, 6 Nov 2024 15:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6FLAAF054831; Wed, 6 Nov 2024 15:21:10 GMT (envelope-from git) Date: Wed, 6 Nov 2024 15:21:10 GMT Message-Id: <202411061521.4A6FLAAF054831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 8d08102794bb - 2024Q4 - math/sdpa: speed up build 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 8d08102794bba0e47227acdd1630da376a9406c6 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d08102794bba0e47227acdd1630da376a9406c6 commit 8d08102794bba0e47227acdd1630da376a9406c6 Author: Robert Clausecker AuthorDate: 2024-11-06 14:06:02 +0000 Commit: Robert Clausecker CommitDate: 2024-11-06 15:20:53 +0000 math/sdpa: speed up build Sub-Makefiles of this port use make macros with lots of shell expansions that are expanded again and again. Assign to these with := so that the shell commands are ran only once. This fixes the port not building due to timeouts under high system load. Approved by: portmgr (build fix blanket) MFH: 2024Q4 (cherry picked from commit 432f2ebe088377708fb08514ea86f2c19a5b0ad5) --- math/sdpa/files/patch-etc_Makefile | 48 ++++++++++++++++++++++++++++++++++++ math/sdpa/files/patch-mumps_Makefile | 27 ++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/math/sdpa/files/patch-etc_Makefile b/math/sdpa/files/patch-etc_Makefile new file mode 100644 index 000000000000..eb4bab9c35f0 --- /dev/null +++ b/math/sdpa/files/patch-etc_Makefile @@ -0,0 +1,48 @@ +--- etc/Makefile.orig 2024-11-06 14:01:05 UTC ++++ etc/Makefile +@@ -21,26 +21,26 @@ SDPA_MAKEFILE = ../Makefile + # The following variables are set from + # the arguments given to './configure' script for building SDPA + ################################################################### +-SDPA_PACKAGE= ${shell grep "^PACKAGE_STRING =" ${SDPA_MAKEFILE} | awk '{printf("%s.%s",$$3,$$4)}'} ++SDPA_PACKAGE:= ${shell grep "^PACKAGE_STRING =" ${SDPA_MAKEFILE} | awk '{printf("%s.%s",$$3,$$4)}'} + +-SDPA_DIR = ${shell grep "^prefix =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} +-SDPA_LIB = ${SDPA_DIR}/lib/libsdpa.a +-MUMPS_DIR = ${shell grep "^MUMPS_DIR =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} +-MUMPS_INCLUDE = ${shell grep "^MUMPS_INCLUDE =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} +-MUMPS_LIBS = ${shell grep "^MUMPS_LIBS =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} +-CC = ${shell grep "^CC =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-CFLAGS = ${shell grep "^CFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} +-CXX = ${shell grep "^CXX =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-CXXFLAGS = ${shell grep "^CXXFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} +-CPPFLAGS = ${shell grep "^CPPFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} +-FC = ${shell grep "^FC =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-FCFLAGS = ${shell grep "^FCFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} +-LAPACK_LIBS = ${shell grep "^LAPACK_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-BLAS_LIBS = ${shell grep "^BLAS_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-PTHREAD_INCLUDE= ${shell grep "^PTHREAD_INCLUDE = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-PTHREAD_LIBS= ${shell grep "^PTHREAD_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-FCLIBS = ${shell grep "^FCLIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-VERSION = ${shell grep "^VERSION = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++SDPA_DIR := ${shell grep "^prefix =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} ++SDPA_LIB := ${SDPA_DIR}/lib/libsdpa.a ++MUMPS_DIR := ${shell grep "^MUMPS_DIR =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} ++MUMPS_INCLUDE := ${shell grep "^MUMPS_INCLUDE =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} ++MUMPS_LIBS := ${shell grep "^MUMPS_LIBS =" ${SDPA_MAKEFILE} | cut -f2 -d= | sed 's+ ++'} ++CC := ${shell grep "^CC =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++CFLAGS := ${shell grep "^CFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} ++CXX := ${shell grep "^CXX =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++CXXFLAGS := ${shell grep "^CXXFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} ++CPPFLAGS := ${shell grep "^CPPFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} ++FC := ${shell grep "^FC =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++FCFLAGS := ${shell grep "^FCFLAGS = " ${SDPA_MAKEFILE} | cut -f2- -d=} ++LAPACK_LIBS := ${shell grep "^LAPACK_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++BLAS_LIBS := ${shell grep "^BLAS_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++PTHREAD_INCLUDE:= ${shell grep "^PTHREAD_INCLUDE = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++PTHREAD_LIBS:= ${shell grep "^PTHREAD_LIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++FCLIBS := ${shell grep "^FCLIBS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++VERSION := ${shell grep "^VERSION = " ${SDPA_MAKEFILE} | cut -f2 -d=} + ################################################################### + + TARGET = make.inc diff --git a/math/sdpa/files/patch-mumps_Makefile b/math/sdpa/files/patch-mumps_Makefile new file mode 100644 index 000000000000..721b74eb8d7f --- /dev/null +++ b/math/sdpa/files/patch-mumps_Makefile @@ -0,0 +1,27 @@ +--- mumps/Makefile.orig 2024-11-06 14:00:35 UTC ++++ mumps/Makefile +@@ -8,15 +8,15 @@ SDPA_MAKEFILE = ../Makefile + # the arguments given to './configure' script for building SDPA + ################################################################### + +-CC = ${shell grep "^CC =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-CFLAGS = ${shell grep "^CFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-CXX = ${shell grep "^CXX =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-CXXFLAGS = ${shell grep "^CXXFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-FC = ${shell grep "^FC =" ${SDPA_MAKEFILE} | cut -f2 -d=} +-FCFLAGS = ${shell grep "^FCFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-PTHREAD_INCLUDE = ${shell grep "^PTHREAD_INCLUDE = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-AR = ${shell grep "^AR = " ${SDPA_MAKEFILE} | cut -f2 -d=} +-RANLIB = ${shell grep "^RANLIB = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++CC := ${shell grep "^CC =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++CFLAGS := ${shell grep "^CFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++CXX := ${shell grep "^CXX =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++CXXFLAGS := ${shell grep "^CXXFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++FC := ${shell grep "^FC =" ${SDPA_MAKEFILE} | cut -f2 -d=} ++FCFLAGS := ${shell grep "^FCFLAGS = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++PTHREAD_INCLUDE := ${shell grep "^PTHREAD_INCLUDE = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++AR := ${shell grep "^AR = " ${SDPA_MAKEFILE} | cut -f2 -d=} ++RANLIB := ${shell grep "^RANLIB = " ${SDPA_MAKEFILE} | cut -f2 -d=} + + ################################################################### +