Received: by mail.netbsd.org (Postfix, from userid 605) id 60B6A84D2E; Sat, 2 May 2020 17:03:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DCD9384CEA for ; Sat, 2 May 2020 17:03:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6UXywwfLleMY for ; Sat, 2 May 2020 17:03:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 59D2B84CD4 for ; Sat, 2 May 2020 17:03:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4EB5BFB27; Sat, 2 May 2020 17:03:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1588438991130250" MIME-Version: 1.0 Date: Sat, 2 May 2020 17:03:11 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/lang/ruby To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20200502170311.4EB5BFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1588438991130250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Sat May 2 17:03:11 UTC 2020 Modified Files: pkgsrc/lang/ruby: gem.mk Log Message: lang/ruby/gem.mk: introduce GEM_KEEPBUILD Introduce GEM_KEEPBUILD which specifies file should not be removed by GEM_CLEANBUILD. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/ruby/gem.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1588438991130250 Content-Disposition: inline Content-Length: 1960 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby/gem.mk diff -u pkgsrc/lang/ruby/gem.mk:1.41 pkgsrc/lang/ruby/gem.mk:1.42 --- pkgsrc/lang/ruby/gem.mk:1.41 Sun Nov 3 19:04:06 2019 +++ pkgsrc/lang/ruby/gem.mk Sat May 2 17:03:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.41 2019/11/03 19:04:06 rillig Exp $ +# $NetBSD: gem.mk,v 1.42 2020/05/02 17:03:11 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -84,8 +84,15 @@ # These files will be additionaly removed from the gem installed in # the installation root. # +# GEM_KEEPBUILD +# A list of shell globs representing files not to remove even it match +# with GEM_CLEANBUILD or GEM_CLEANBUILD_EXTENSIONS. +# +# Default: (empty) +# # GEM_NAME # The name of the gem to install. The default value is ${DISTNAME}. +# gem installed in the installation root. # # GEM_SPECFILE # The path to the gemspec file to use when building a gem using @@ -210,6 +217,7 @@ _RUBY_PRINT_PLIST_GEM+= /^${RUBY_GEM_BAS GEM_SPECFILE?= ${WRKDIR}/${DISTNAME}.gemspec GEM_CLEANBUILD?= ext/* GEM_CLEANBUILD_EXTENSIONS+= *.out *.log +GEM_KEEPBUILD?= # empty .if !empty(GEM_CLEANBUILD:M/*) || !empty(GEM_CLEANBUILD:M*../*) PKG_FAIL_REASON+= "GEM_CLEANBUILD must be relative to "${PREFIX}/${GEM_LIBDIR:Q}"." @@ -219,6 +227,10 @@ PKG_FAIL_REASON+= "GEM_CLEANBUILD must b PKG_FAIL_REASON+= "GEM_CLEANBUILD_EXTENSIONS must be relative to "${PREFIX}/${GEM_LIBDIR:Q}"." .endif +.if !empty(GEM_KEEPBUILD:M/*) || !empty(GEM_KEEPBUILD:M*../*) +PKG_FAIL_REASON+= "GEM_KEEPBUILD must be relative to "${PREFIX}/${GEM_LIBDIR:Q}"." +.endif + .PHONY: gem-build do-build: _gem-pre-build gem-build @@ -297,6 +309,7 @@ _gem-build-cleanbuild: find . -print | sort -r | \ while read file; do \ case $$file in \ + ${GEM_KEEPBUILD:@.p.@./${.p.}) continue ;;@} \ ${GEM_CLEANBUILD:@.p.@./${.p.}) ;;@} \ *) continue ;; \ esac; \ --_----------=_1588438991130250--