Date: Mon, 5 Feb 2024 20:29:19 GMT From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1832da1106e5 - main - math/octave-forge-rtree: Fix build issues. Message-ID: <202402052029.415KTJDn051879@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=1832da1106e584fc42e0f1e8b20e2abfba1f9dde commit 1832da1106e584fc42e0f1e8b20e2abfba1f9dde Author: Stephen Montgomery-Smith <stephen@FreeBSD.org> AuthorDate: 2024-02-05 20:24:42 +0000 Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org> 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 <salvadore@freebsd.org>, 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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402052029.415KTJDn051879>