From nobody Mon Jan 15 12:09:28 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 4TD9tK1fpmz56nFQ; Mon, 15 Jan 2024 12:09:29 +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 4TD9tK0MsDz4NdP; Mon, 15 Jan 2024 12:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705320569; 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=2NKqMrmeKf5SnFxGr5phPSYe2tXo0XaA7ugl+mwrkOg=; b=k3tSqYzDWF1SfaTGrPFCLbHv4MADbAcDo8Il6bUAZFPufm3hHz36taaZpS3QE4YvvenVs3 Bt9fw/j3J3ROQVtQpAHoZF9Fo7uYCyMkiqIuHRG/EWenJVm70LlpykdBu5JhYYFj4YAOKs 3BZI5mqVC4aelg0BAKcAXqhm5w+6zYsqwOCGUXtrOB46txLJsuZtY6V5IM5tNbivMHow6I zTm8rtSKMihGtQjwc+UopEg/7OGsMoSI4u/zBxXEuh4m48mAZt3sCofcX/8AuGLlzxxw7j ltkN8IR55/vnyOBccu6+d+sBPFQ1EWVYC9D7UThf7gcpBQCnhSJCl28ZaM7BcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705320569; 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=2NKqMrmeKf5SnFxGr5phPSYe2tXo0XaA7ugl+mwrkOg=; b=PPj67Bdr8JxxPsH82VZi4mzMpr/YGGJ71z/qEs4peB0Z4tp2D8YxPJ2yY7kTqRjZUCW8TH UrZgi0JU29GEnKOyrQqaJXSZsrHHAUqGP/xQpcdZtzB0lX4Kcz+nJYtWdA+maHHfNDjAO9 TBlPj2d6jVrBeEwp/KpDReRFjD6NLaIR0iy+BRGtUIaZMYmRJim9GpjehH6JXayhWs3mfq fjakKi30eYkmkfQGfwvg9CdqmMxVTc3uHKdx3PFBrafesc8Qn1/PtKW+Ym3GhxfUvzS7QL pdh3lSXYJqcqCELtqsyusw0b2Zd+pZ4fwIcwp9nlTBQa+NPKXSN1ulEyYTccxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705320569; a=rsa-sha256; cv=none; b=gO2mRAjV/gIU+yr3LWL32CI3GJRd0mmmmaEP7G1yc73X4XmwxwXLas93hRN6bovErJccfj xa+n/I8Juj1TzvC9ypoVSFgMnft41rd41BouTrIyJ4TSA7sR7YZErX5XcCrSZzgIUgDqG4 A9P5aOjUt/wntkXEiRUh0A21ehVopSORY5RxwZUw8LT1e8c0uFOLLsqU4QJBHmW37tbVz0 y6FniOisIxPSqEP2pyDJipyepwLqrMIrSgVFgC8rl12/mPpAAdIpPovpWlhlcI//bLVs9z HLBITUyGWAkbYci7sZfBd7kyKaFDPumRIuVCZU0DkLM/LbfZcABrln3qZgoaxw== 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 4TD9tJ6P4xzw6R; Mon, 15 Jan 2024 12:09:28 +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 40FC9Svo074090; Mon, 15 Jan 2024 12:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FC9Sfj074087; Mon, 15 Jan 2024 12:09:28 GMT (envelope-from git) Date: Mon, 15 Jan 2024 12:09:28 GMT Message-Id: <202401151209.40FC9Sfj074087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: bb8f2a48030e - 2024Q1 - Revert "gem: make it possible to generate gems that require rust/cargo" 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: bb8f2a48030ee7256d6bd78025ff62a20715f748 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb8f2a48030ee7256d6bd78025ff62a20715f748 commit bb8f2a48030ee7256d6bd78025ff62a20715f748 Author: Matthias Fechner AuthorDate: 2024-01-08 04:46:48 +0000 Commit: Matthias Fechner CommitDate: 2024-01-15 12:07:02 +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/ (cherry picked from commit 6b83119ab0b88ef9960aa86ae7517280ac15545e) --- 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: