From nobody Mon Feb 5 20:29:19 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 4TTHzN02wdz58x1L; Mon, 5 Feb 2024 20:29:20 +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 4TTHzM6HYtz4p3P; Mon, 5 Feb 2024 20:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707164959; 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=ba9myGbOI7MIsACHkBZTmAYVT0mpNJ2BiA12hOdqdNY=; b=OIkcrTdspwYysw0wpuAY49qJX3zZIFh1hGlN+w3WQb9usekDQQqO0owLn6NxSTr0zYkUVP uGW8IuCREZ2R3gW0qP4THYCOuz5A0O8CAuPo82QPfiI0E7IbAKa4VqYyMZmWZGXt4fDQnc DXJ/S9lfPQSMZWG+X39t3Yo3EflcXZ32k0AlZAhOkmbVDS60ujfM8CRPUn9rnxqBKNIwmB HLBAAe5IanDfCpK9fg2HVkgjz8di9A8SLbdabdtlMhVYItJ4jqwbUHOd/G3fhjREXfsjhi haZBCz3589v6rnOnMIAjcf3RjDyvfC0uJfRCFd8yOoRHbW2MZyTfnNJX+BJsuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707164959; 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=ba9myGbOI7MIsACHkBZTmAYVT0mpNJ2BiA12hOdqdNY=; b=yuLPoq8covPH0teA5o3KD7faU4bDLgUx4BANsyJ4q0XPWCOzbqNwY2owBxrSKf65smt8OE O4ENLCQn8kMod5H8/YgpHJHEJbyFAiF+QfePmwvWxlRncN88oD2nrIevWwkj32cdTDbNG/ bIGwh9jaNFSg2lbniQez+UKMePKXmKDcnkG7zvL4rVjDWpExm0ARvU4mPX2ZSpxbvSimQY 8CxgN6tH0vOAD+mBVbQhtZy/0S2R50HfNEZ4i+Pi9Kmkb2BbTUiA17ihPmOMyyWCmHMytf vO4kdDqVBT9AmHFsVxIzSU9ayd7scoD5HTulU/RmQJKGbL8CyGlKA4aY+zgDLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707164959; a=rsa-sha256; cv=none; b=N0IYySE80fhWkSDbp0bb5yoAiatkIRGZzbwMAs9kabZsso8kE7lh+FOZJWRC9FxY5I79/+ kLbIIvNREVfvl3M9pLiMgTcDu1kUgPWtunoM9VMDBzs4QZWpSTNUqJxHsF6pM0FH0HxUYf qOf0FVGiQcF5cG7NcnPWg/KiYcOQzFXdhlYNQK95SqxZojxGFgZi4BFhs/wIW8ftkh35X0 XsNGto2KUcQoVUe2fmQ1BP6PpbxU/G3jqzSgblCTWVrvChcB7vPHYr/7BoK4VURkyu9zkT dcMwBHKXGeaHqC+iCKTAVS5y0XnVZNhFhbnXcxIQcoCLSIb0uyZo6gpBe61nQQ== 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 4TTHzM5LNCzvJH; Mon, 5 Feb 2024 20:29:19 +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 415KTJCI051882; Mon, 5 Feb 2024 20:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415KTJDn051879; Mon, 5 Feb 2024 20:29:19 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:29:19 GMT Message-Id: <202402052029.415KTJDn051879@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 1832da1106e5 - main - math/octave-forge-rtree: Fix build issues. 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1832da1106e584fc42e0f1e8b20e2abfba1f9dde Auto-Submitted: auto-generated The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=1832da1106e584fc42e0f1e8b20e2abfba1f9dde commit 1832da1106e584fc42e0f1e8b20e2abfba1f9dde Author: Stephen Montgomery-Smith AuthorDate: 2024-02-05 20:24:42 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2024-02-05 20:24:42 +0000 math/octave-forge-rtree: Fix build issues. 1. Requires autoreconf:build to build in clean environment. 2. Failed in poudriere, because certain environment variables weren't set in patch phase. PR: 276802 Reported by: Lorenzo Salvadore , pkg-fallout@ --- math/octave-forge-rtree/Makefile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/math/octave-forge-rtree/Makefile b/math/octave-forge-rtree/Makefile index a7a7cb982ca3..83e93e77617c 100644 --- a/math/octave-forge-rtree/Makefile +++ b/math/octave-forge-rtree/Makefile @@ -7,9 +7,9 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} WWW= https://packages.octave.org/ LICENSE= GPLv3 -LICENSE_FILE= ${EXTRACT_DIR}/COPYING +LICENSE_FILE= ${WRKSRC}/COPYING -USES= octave +USES= octave autoreconf:build BUILD_DEPENDS+= gtar:archivers/gtar LIB_DEPENDS+= libjansson.so:devel/jansson @@ -21,16 +21,23 @@ GL_COMMIT= 6456b2ebb38528ea6861019b4b85699796ba91fa CFLAGS+= -I${PREFIX}/include -L${PREFIX}/lib -OCTAVE_SRC= ${OCTAVE_PKGNAME}-${DISTVERSION} -EXTRACT_DIR= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT} +OCTAVE_SRC= ${GL_PROJECT}-${GL_COMMIT} +WRKSRC= ${WRKDIR}/${OCTAVE_SRC} post-patch: - ${REINPLACE_CMD} s/^tar/gtar/ ${EXTRACT_DIR}/src/pkg/bin/pkg-build - cd ${EXTRACT_DIR} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" ./configure - cd ${EXTRACT_DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} package - cd ${EXTRACT_DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} spotless - ${TAR} xvf ${EXTRACT_DIR}/src/pkg/versions/${OCTAVE_SRC}.tar.gz -C ${WRKDIR} - -GNU_CONFIGURE= yes + ${REINPLACE_CMD} s/^tar/gtar/ ${WRKSRC}/src/pkg/bin/pkg-build + +do-build: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" ./configure + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} package + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} spotless + ${TAR} xvf ${WRKSRC}/src/pkg/versions/${OCTAVE_DISTNAME}.tar.gz -C ${WRKSRC} + cd ${WRKSRC}/${OCTAVE_DISTNAME}/src && \ + ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" ./configure && \ + ${SETENV} ${MAKE_ENV} CLAGS="${CFLAGS}" ${GMAKE} + +pre-install: + ${RM} ${WRKSRC}/${OCTAVE_DISTNAME}/src/Makefile ${WRKSRC}/${OCTAVE_DISTNAME}/src/configure + cd ${WRKSRC} && ${TAR} cfz ${WRKDIR}/${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_DISTNAME} .include