Date: Mon, 8 Jan 2024 04:48:03 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6b83119ab0b8 - main - Revert "gem: make it possible to generate gems that require rust/cargo" Message-ID: <202401080448.4084m36w023999@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b83119ab0b88ef9960aa86ae7517280ac15545e commit 6b83119ab0b88ef9960aa86ae7517280ac15545e Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-01-08 04:46:48 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-01-08 04:46:48 +0000 Revert "gem: make it possible to generate gems that require rust/cargo" This reverts commit 87916ecbfac7532b4d3de63efa36ed8f8e637e36. I will review it again and fix problems it showed with path rubygem/ --- Mk/Uses/gem.mk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index 69924ae3d172..a1e77273932a 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -23,10 +23,9 @@ IGNORE= Incorrect 'USES+= gem:${gem_ARGS}' usage: argument [${arg}] is not recog .include "${USESDIR}/ruby.mk" PKGNAMEPREFIX?= rubygem- -GEM_EXT= .gem -# needs to be disabled that rust cargo directories are correctly extracted -#EXTRACT_ONLY= -GEM_DIST_SUBDIR?= rubygem +EXTRACT_SUFX= .gem +EXTRACT_ONLY= +DIST_SUBDIR= rubygem BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems EXTRACT_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems @@ -64,16 +63,15 @@ PLIST_SUB+= PORTVERSION="${PORTVERSION}" \ GEM_DOC_DIR="${GEM_DOC_DIR}" \ GEM_SPEC="${GEM_SPEC}" \ GEM_CACHE="${GEM_CACHE}" \ - GEM_EXT="${GEM_EXT}" + EXTRACT_SUFX="${EXTRACT_SUFX}" RUBYGEMBIN= ${LOCALBASE}/bin/gem . if defined(DISTFILES) -GEMFILES?= ${DISTFILES:C/:[^:]+$//} +GEMFILES= ${DISTFILES:C/:[^:]+$//} . else -GEMFILES?= ${DISTNAME}${GEM_EXT} +GEMFILES= ${DISTNAME}${EXTRACT_SUFX} . endif -DISTFILES+= ${GEM_DIST_SUBDIR}/${GEMFILES} RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin @@ -83,16 +81,17 @@ RUBYGEM_ARGS+= --document rdoc,ri RUBYGEM_ARGS+= --no-document . endif -_USES_extract+= 590:gem-extract -gem-extract: - @${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${GEM_DIST_SUBDIR}/${GEMFILES} - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${GEM_DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \ +. if !target(do-extract) +do-extract: + @${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \ ${ECHO_MSG} "===> Extraction failed unexpectedly."; \ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \ fi; \ ${FALSE}; \ fi) +. endif . if !target(do-build) do-build:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401080448.4084m36w023999>