From nobody Tue Feb 11 13:30:40 2025 X-Original-To: dev-commits-ports-branches@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 4Ysj4f1WdTz5nb0F; Tue, 11 Feb 2025 13:30:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ysj4d0Vzxz3xWw; Tue, 11 Feb 2025 13:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739280641; 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=IhaCBITTGgKXCNe87119p0UPU8v0NDoSEHPLHr2K+fo=; b=abKLbXh/Jiueud5xO91pp8YI59kSeBdAKP3mzhjufjsFkZvdvVh4tQ4p3Ye7aWDacg14ER 0wUvImja6uSP2X7zrTFQNT5h5QD+aumHgt5sGJj8+oVAE4qRFvS8EMsIahFjM3ZsDjNxAH /UWNNuQXf4dkTP+RoItjVnHaNQVygAOLtpnS+Ah7ysMWWsZ5eiKwtGexv7PTR2y8VmfjUw wLQPdfYjRjrf5lLCm6EsM0Qve2cyImlVc12cGkjkQJfYJ3igevU2J0ld1GXxp59OGsbnYD /sU43gUv2uayQtNWUHeIJPqnmlph54Bbsp+NqmZcuormVjRHf4y+AiBiCXMTGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739280641; 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=IhaCBITTGgKXCNe87119p0UPU8v0NDoSEHPLHr2K+fo=; b=rAkyvEkgowXxuhjOax1mQY37cnCXtbq7J3PQ1WLeTsEcDzuV8engHksiQ+D3GizNV/UkQM Zesd0lqM2gR0wrXJ37SrBPru2BjnVk0vuAUnWEb+uN+Q0YexVezfilgY45wQNoaI/LsHdJ JQx+11uPAlaoGGi1cGMWUeXtBUyp9EK0oFQe1NhqXB5c6eVzqEP/BP1z2K9DiTihISeLo8 jRh1mvNSgMweiR2Vm6vVRiCIYK5tBoZbH7hL7JAjEbWIwWoZ/2/BAE3zYytnzXNz2wcu58 VFOm+tiIIma/obk1haBoprKSDKL5szpmCqxx7dI0XEharGa2waUC+ENozCt1pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739280641; a=rsa-sha256; cv=none; b=cy/rpbhXOG0fCPsRA8FDkBer9jCQDO+HUZWK8AhpdOAf1kZiPj1E9nS4b9akdlP2AQauZl D43+MplGRId2ZKp0G2CjIho0oHcYFi5/pR6w2uAlOCg8APyMyVgjMN5FmNjT90/9MEGmEM H5affGTgyIIkAxp2780W8zb0f8J+kItXq92QLOj4u/VdFUi0zyefnBvV2Kb6k9Bwo2baci gzvOZNN5cDoQUwM0ge9EMrXGcrSxrlod/jC1kZm7mbRauDv/M5YSIvQ8Q2L3QV1KYjMo0e M+p8jQBLBjfpbVNBpEWypwNJ2s06hWFUb7BcPEJIj7Aol84pSkxgzllSIXN3xw== 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 4Ysj4c73JYz1CyK; Tue, 11 Feb 2025 13:30:40 +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 51BDUeS5076429; Tue, 11 Feb 2025 13:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BDUege076426; Tue, 11 Feb 2025 13:30:40 GMT (envelope-from git) Date: Tue, 11 Feb 2025 13:30:40 GMT Message-Id: <202502111330.51BDUege076426@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: f5f8a753df92 - 2025Q1 - math/lp_solve: honor CFLAGS List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: f5f8a753df9221182c7c4baec1ae594163ca69e2 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5f8a753df9221182c7c4baec1ae594163ca69e2 commit f5f8a753df9221182c7c4baec1ae594163ca69e2 Author: Eric Camachat AuthorDate: 2025-02-05 16:05:42 +0000 Commit: Robert Clausecker CommitDate: 2025-02-11 13:29:52 +0000 math/lp_solve: honor CFLAGS Honor CFLAGS when compiling platform.c. PR: 270851 MFH: 2025Q1 Approved by: mayo@oyam.ca (maintainer timeout) (cherry picked from commit bd63a46daaeeb4f4cabb87892555f180a6e44fa9) --- math/lp_solve/Makefile | 7 ++++--- math/lp_solve/files/patch-respect-TMPDIR | 31 +++++++++++++++++++++------- math/lp_solve/files/patch-shared+commonlib.c | 6 +++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile index 8e30f685b212..902f608fa846 100644 --- a/math/lp_solve/Makefile +++ b/math/lp_solve/Makefile @@ -1,8 +1,9 @@ PORTNAME= lp_solve -PORTVERSION= 5.5.2.5 +DISTVERSION= 5.5.2.5 +PORTREVISION= 1 CATEGORIES= math -MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION} -DISTNAME= ${PORTNAME}_${PORTVERSION}_source +MASTER_SITES= SF/lpsolve/lpsolve/${DISTVERSION} +DISTNAME= ${PORTNAME}_${DISTVERSION}_source MAINTAINER= mayo@oyam.ca COMMENT= Linear Programming Solver diff --git a/math/lp_solve/files/patch-respect-TMPDIR b/math/lp_solve/files/patch-respect-TMPDIR index 870da18d87cd..244a48ef9680 100644 --- a/math/lp_solve/files/patch-respect-TMPDIR +++ b/math/lp_solve/files/patch-respect-TMPDIR @@ -1,8 +1,10 @@ --- lp_solve/ccc.orig 2009-01-25 18:39:03 UTC +++ lp_solve/ccc -@@ -2,31 +2,33 @@ +@@ -1,34 +1,35 @@ + : src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' c=cc ++opts='-O3' +tmp="${TMPDIR:-/tmp}" + @@ -18,7 +20,7 @@ +echo '#include '>>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"${tmp}"/platform.c -+$c "${tmp}"/platform.c -o "${tmp}"/platform ++$c $opts "${tmp}"/platform.c -o "${tmp}"/platform +PLATFORM=`"${tmp}"/platform` +rm "${tmp}"/platform "${tmp}"/platform.c >/dev/null 2>&1 @@ -38,21 +40,25 @@ +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo 'main(){isnan(0);}'>>"${tmp}"/isnan.c -+$c "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 ++$c $opts "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 if [ $? = 0 ] then NOISNAN= else NOISNAN=-DNOISNAN fi -rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1 +- +-opts='-O3' +rm "${tmp}"/isnan.c "${tmp}"/isnan >/dev/null 2>&1 - opts='-O3' - + def= + if [ "$PLATFORM" = "SCO_UNIX" ] --- lpsolve55/ccc.orig 2009-03-25 00:27:18 UTC +++ lpsolve55/ccc -@@ -2,29 +2,31 @@ +@@ -1,30 +1,33 @@ + : src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' c=cc ++opts='-O3' +tmp="${TMPDIR:-/tmp}" + @@ -68,7 +74,7 @@ +echo '#include '>>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"${tmp}"/platform.c -+$c "${tmp}"/platform.c -o "${tmp}"/platform ++$c $opts "${tmp}"/platform.c -o "${tmp}"/platform +PLATFORM=`"${tmp}"/platform` +rm "${tmp}"/platform "${tmp}"/platform.c >/dev/null 2>&1 @@ -86,7 +92,7 @@ +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo 'main(){isnan(0);}'>>"${tmp}"/isnan.c -+$c "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 ++$c $opts "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 if [ $? = 0 ] then NOISNAN= else NOISNAN=-DNOISNAN @@ -96,3 +102,12 @@ def= so= +@@ -34,8 +37,6 @@ then def='-dy -K PIC -DNOLONGLONG' + else dl=-ldl + so=y + fi +- +-opts='-O3' + + $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src + ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` diff --git a/math/lp_solve/files/patch-shared+commonlib.c b/math/lp_solve/files/patch-shared+commonlib.c index 7f6322a4ac33..2d21d13829e1 100644 --- a/math/lp_solve/files/patch-shared+commonlib.c +++ b/math/lp_solve/files/patch-shared+commonlib.c @@ -16,12 +16,12 @@ - struct timeb buf; + struct timeval tv; + struct timezone tz; -+ -+ gettimeofday(&tv, &tz); -+ return((double)tv.tv_sec+((double)tv.tv_usec)/1000000.0); - ftime(&buf); - return((double)buf.time+((double) buf.millitm)/1000.0); ++ gettimeofday(&tv, &tz); ++ return((double)tv.tv_sec+((double)tv.tv_usec)/1000000.0); ++ #endif }