From nobody Tue May 14 04:30:32 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 4Vdk1P116gz5KLp9; Tue, 14 May 2024 04:30:33 +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 4Vdk1N6Gb7z4bPm; Tue, 14 May 2024 04:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715661032; 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=ImnfqMuBWWeX43pmkEU4Lcjqsi56HB/GmaHxoPrmaO4=; b=C2AA8vC/Nn1N0tz+wC/zRdCb5/58FKw8GaI3uP4JuE76coPW8fbZDNZTWhDOlNPtM5tJPS fNq9sltYZkjdJvccooUE+YzH+xMTE0ZklcpEynpLk5zSgs3aBBsj4uIxle2D66txPMEze5 F6MAXcj3f6A5cY0RolbmvX6b/cYzWSlL49QHetTqXwtgnuDVg5To7OUB2s64kpGRfmJIWM W1tcvmmmvmoDMnBN0FDx6dtGWGZkT8dXQ+p/q5XcFs8xVWG4Y0H94t+2fLg9Nw3aljv/+V 2ofgSF20cCCqSCaMuizWx2ke8ngfPgW6iE3WQceGVJcT1M8PaZWdEdGSE23Gqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715661032; a=rsa-sha256; cv=none; b=KYbSI5LnNq7q4onCxwXayBXcEV5H6IjjYKKYigQucg5VXG710NAVNAt1mw2ezhkOfnxFOA sHz84Stg48PkEHNLH62pVs6rxa3lWWRJuoXYsRsB8+KPN97sYEeJ27hh+wkZC59a900hAc JHchAekKWWyKOq5SGnr8BSicQ4EbWPNo6wqw3l/8l6i4Yrv1oembR7tpzxAr3ItE5+Eebl Gs7h0tiDPdLDYceQqrCoKR5ras/ytUWMxKfmIu5kvSDCM9TntVAhSIvh4AjsfnCyJ3Cg1C cihEv1i6B3FthxX/Rwrg43r4H4cQSUUuEjQt1on+fOYItJURI+Ll/VwuSGXPkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715661032; 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=ImnfqMuBWWeX43pmkEU4Lcjqsi56HB/GmaHxoPrmaO4=; b=Dh9ilGs0PO4lMwqZMmivSjw2ZpVdQ8aOZRQ2wIwMk+g5dJ0sdph8lin/mC4fw1zPiZYoOD B4hhW3tcL4Pr18QTblBncH+GaXcCQSJSyteFaN2YCMihqxtnJbdKED+jtDEhiRzAj4snjA zAnzU/fhBcaGEzFMpB7VvdwnK4rRxXP1cbigPxBKvT67NcJv1J75QH0XI2bs78D0TyXdz0 HyXyBZ6B51Z0hkbK9nhjNoEPO1Z9+/xJJZQrTv3CLXmPH7r1acDXid4Q+Xtati2divOsuQ pseAjVvLFFsZe14M/NnzA1zT6g6McE3MNSm//VEpq48vRJd9eyUdnOR785eyWQ== 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 4Vdk1N5gMCzHVW; Tue, 14 May 2024 04:30:32 +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 44E4UWpv060708; Tue, 14 May 2024 04:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E4UWTn060705; Tue, 14 May 2024 04:30:32 GMT (envelope-from git) Date: Tue, 14 May 2024 04:30:32 GMT Message-Id: <202405140430.44E4UWTn060705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 84f001c6c642 - main - lang/ruby3[1-3]: Refine ports 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f001c6c642cf3c87f6fc4a0a1327dc5182cf1c Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=84f001c6c642cf3c87f6fc4a0a1327dc5182cf1c commit 84f001c6c642cf3c87f6fc4a0a1327dc5182cf1c Author: Daniel Engberg AuthorDate: 2024-05-14 04:26:43 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-05-14 04:26:43 +0000 lang/ruby3[1-3]: Refine ports * Skip extracting unnecessary files by setting EXTRACT_AFTER_ARGS instead of removing them with post-patch target after they are extracted. * Use 'USES=localbase' to set path of header and library files. PR: 278764 --- lang/ruby31/Makefile | 22 ++++++++++++---------- lang/ruby32/Makefile | 22 ++++++++++++---------- lang/ruby33/Makefile | 22 ++++++++++++---------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile index dff40081c447..75a11f27f740 100644 --- a/lang/ruby31/Makefile +++ b/lang/ruby31/Makefile @@ -23,12 +23,22 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ruby:none ssl tar:xz +USES= autoreconf cpe localbase ruby:none ssl tar:xz CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} USE_LDCONFIG= yes +# We get these from other ports +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ + --exclude ${DISTNAME}/ext/win32* \ + --exclude ${DISTNAME}/lib/bundler* \ + --exclude ${DISTNAME}/libexec/bundler \ + --exclude ${DISTNAME}/man/erb.1 \ + --exclude ${DISTNAME}/man/irb.1 \ + --exclude ${DISTNAME}/man/ri.1 \ + --no-same-owner --no-same-permissions + GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -40,9 +50,8 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= -CPPFLAGS+= -I${LOCALBASE}/include # Keep this, else ruby will fail to load libraries dependent of libpthread. -LIBS+= -lpthread -L${LOCALBASE}/lib +LIBS+= -lpthread WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.1 @@ -124,13 +133,6 @@ RB_SET_CONF_VAR= ${SH} -c \ '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \ -- -post-patch: -# We get these from other ports -.for d in bin/* ext/dbm ext/gdbm ext/win32* lib/bundler* libexec/bundler* \ - man/bundle* man/erb.1 man/gemfile* man/irb.1 man/ri.1 - @${RM} -r ${BUILD_WRKSRC}/${d} -.endfor - post-build: # # Hack to allow modules to be installed into separate PREFIX and/or under user diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index 846728ac4f45..45894febd124 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -19,12 +19,22 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ruby:none ssl tar:xz +USES= autoreconf cpe localbase ruby:none ssl tar:xz CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} USE_LDCONFIG= yes +# We get these from other ports +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ + --exclude ${DISTNAME}/ext/win32* \ + --exclude ${DISTNAME}/lib/bundler* \ + --exclude ${DISTNAME}/libexec/bundler \ + --exclude ${DISTNAME}/man/erb.1 \ + --exclude ${DISTNAME}/man/irb.1 \ + --exclude ${DISTNAME}/man/ri.1 \ + --no-same-owner --no-same-permissions + GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -36,9 +46,8 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= -CPPFLAGS+= -I${LOCALBASE}/include # Keep this, else ruby will fail to load libraries dependent of libpthread. -LIBS+= -lpthread -L${LOCALBASE}/lib +LIBS+= -lpthread WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.2 @@ -123,13 +132,6 @@ RB_SET_CONF_VAR= ${SH} -c \ '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \ -- -post-patch: -# We get these from other ports -.for d in bin/* ext/dbm ext/gdbm ext/win32* lib/bundler* libexec/bundler* \ - man/bundle* man/erb.1 man/gemfile* man/irb.1 man/ri.1 - @${RM} -r ${BUILD_WRKSRC}/${d} -.endfor - post-build: # # Hack to allow modules to be installed into separate PREFIX and/or under user diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile index b2d3e8bdb269..c861bdf7f083 100644 --- a/lang/ruby33/Makefile +++ b/lang/ruby33/Makefile @@ -20,12 +20,22 @@ BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml RUN_DEPENDS= libffi>=0:devel/libffi -USES= autoreconf cpe ruby:none ssl tar:xz +USES= autoreconf cpe localbase ruby:none ssl tar:xz CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} CPE_UPDATE= p${RUBY_PATCHLEVEL} USE_LDCONFIG= yes +# We get these from other ports +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ + --exclude ${DISTNAME}/ext/win32* \ + --exclude ${DISTNAME}/lib/bundler* \ + --exclude ${DISTNAME}/libexec/bundler \ + --exclude ${DISTNAME}/man/erb.1 \ + --exclude ${DISTNAME}/man/irb.1 \ + --exclude ${DISTNAME}/man/ri.1 \ + --no-same-owner --no-same-permissions + GNU_CONFIGURE= yes CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --disable-rpath \ @@ -37,9 +47,8 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --with-vendordir="${PREFIX}/lib/ruby/vendor_ruby" CONFIGURE_ENV= debugflags= -CPPFLAGS+= -I${LOCALBASE}/include # Keep this, else ruby will fail to load libraries dependent of libpthread. -LIBS+= -lpthread -L${LOCALBASE}/lib +LIBS+= -lpthread WRKSRC= ${RUBY_WRKSRC} RUBY_VER= 3.3 @@ -115,13 +124,6 @@ RB_SET_CONF_VAR= ${SH} -c \ post-extract-DOCS-on: ${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog -post-patch: -# We get these from other ports -.for d in bin/* ext/dbm ext/gdbm ext/win32* lib/bundler* libexec/bundler* \ - man/bundle* man/erb.1 man/gemfile* man/irb.1 man/ri.1 - @${RM} -r ${BUILD_WRKSRC}/${d} -.endfor - post-build: # # Hack to allow modules to be installed into separate PREFIX and/or under user