From nobody Wed Apr 27 07:33:00 2022 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 BC460199F606; Wed, 27 Apr 2022 07:33:00 +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 4Kp9T84qVmz56Fr; Wed, 27 Apr 2022 07:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651044780; 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=Te/KFA532yNhOd3kzGRvqTC2klAgf6WcF4VsMoosats=; b=x2RQKmfbHUR1UjHBbbVlecHK8jxXPaJ01D247DxENXXqtVLJBARY0TjIm+ZqxVrlmaxGXc ORisXav8G9zg1Ok6GDjBz95kTpb2AEhbrmNyQ5+dQ9+Yy+gTcCSbxQMNQUrxNfcw1zLVR5 Dhsorg6FUEH2nzoYcXJAwPR06Sr6eFgjlhRStLuZMiMUcQqvQKxUQRzCypGXvGZ6c2NodW lX231PVYm0h1hk/ucEuHmSnJI26IGzMH49ROO2HOOxjSDNnnk7czdjn43zgAPdLz7Dgy/b 3C1fbnszX4oL2DRujdeXwuUw3HuSUsMA8EzDHoEaRm15PfiaWj9Ky7upAJr1fA== 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 85B891FC3F; Wed, 27 Apr 2022 07:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23R7X0E5085169; Wed, 27 Apr 2022 07:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23R7X0il085168; Wed, 27 Apr 2022 07:33:00 GMT (envelope-from git) Date: Wed, 27 Apr 2022 07:33:00 GMT Message-Id: <202204270733.23R7X0il085168@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: 8272d84a122f - main - www/h2o: Fix build with Ruby 3.x when MRUBY option is enabled 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 8272d84a122f4169c06d794415d598a8b965b43e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651044780; 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=Te/KFA532yNhOd3kzGRvqTC2klAgf6WcF4VsMoosats=; b=mKbnK9WU9+mOEXeY88le4LzQOse/tNeNSWnHTfTLXKmylCdYlbd90Tr8KudVo6sdTb+4FH 0O4YdXgO8LVEIX5cQSgO4bUCoHgUqnI5KOC7NK08X78O0aYaLUN+3JPznUi7V/HH7byPxA ljUOwTUkhz5ETb6jKEn6C3EQbm6t4m1egNNkfpB3/lG1hVqDkvR1tAQrKOxa+UQLtVRw+M 1919k52m57czuWJ7tIxAoLadptRCU+swyvv5mNaC+qQ3TVEBxLYplM1a3aMmn1iFl8fzmb qkvkykKgyZWTTKdyd/CJnCtge57OJRDowMP94QgamKpwrdcZC52yCIojwMUdNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651044780; a=rsa-sha256; cv=none; b=BAESnH4ok/Zyj2tijHo4XMFwwt4FDf6QzHWuq6AiJcG4hme/6pUUQumZQmfz1ftfeDeo8l Pa2wyc6PzzR2yGsCOm6qTGDQWnrMu3zR+Q2y9tQmSZq9suiS6pcjMxNso5knbGo8YPNiqi ZoQj92lO9ooFktDSLnOiKLnLijPlNYOHBKHSpia+0bPEO7tx3PSSo7wUmKlg5iWPCuUb0F fjtt6SYe6DCbH3NeVNp2k9UIjdryqZz7NKCM8A65Z1G9b2Qm1LBngepsywtgrvTyy+0WuM Ec2SbxNhvPIFchoZm5camTi8eBgdsACUZrKFazw/+29gy9hicrdLi0JWUbWKkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8272d84a122f4169c06d794415d598a8b965b43e commit 8272d84a122f4169c06d794415d598a8b965b43e Author: Florian Smeets AuthorDate: 2022-04-23 14:32:45 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-27 07:32:14 +0000 www/h2o: Fix build with Ruby 3.x when MRUBY option is enabled Reference: https://github.com/h2o/h2o/issues/2789 PR: 263053 Approved by: maintainer --- www/h2o/Makefile | 7 ---- www/h2o/files/patch-deps_mruby_Rakefile | 63 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index ce57e5a871da..27885b55a134 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -58,13 +58,6 @@ MRUBY_USES= bison MRUBY_USE= ruby=yes MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes -.include - -.if ${PORT_OPTIONS:MMRUBY} -BROKEN_RUBY30= yes -BROKEN_RUBY31= yes -.endif - post-patch: @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ diff --git a/www/h2o/files/patch-deps_mruby_Rakefile b/www/h2o/files/patch-deps_mruby_Rakefile new file mode 100644 index 000000000000..edbd51a02ecd --- /dev/null +++ b/www/h2o/files/patch-deps_mruby_Rakefile @@ -0,0 +1,63 @@ +--- deps/mruby/Rakefile.orig 2019-08-12 14:09:44 UTC ++++ deps/mruby/Rakefile +@@ -37,15 +37,15 @@ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin" + task :default => :all + + bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin" +-FileUtils.mkdir_p bin_path, { :verbose => $verbose } ++FileUtils.mkdir_p bin_path, verbose: $verbose + + depfiles = MRuby.targets['host'].bins.map do |bin| + install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}") + source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}") + + file install_path => source_path do |t| +- FileUtils.rm_f t.name, { :verbose => $verbose } +- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose } ++ FileUtils.rm_f t.name, verbose: $verbose ++ FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose + end + + install_path +@@ -78,8 +78,8 @@ MRuby.each_target do |target| + install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}") + + file install_path => exec do |t| +- FileUtils.rm_f t.name, { :verbose => $verbose } +- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose } ++ FileUtils.rm_f t.name, verbose: $verbose ++ FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose + end + depfiles += [ install_path ] + elsif target == MRuby.targets['host-debug'] +@@ -87,8 +87,8 @@ MRuby.each_target do |target| + install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}") + + file install_path => exec do |t| +- FileUtils.rm_f t.name, { :verbose => $verbose } +- FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose } ++ FileUtils.rm_f t.name, verbose: $verbose ++ FileUtils.cp t.prerequisites.first, t.name, verbose: $verbose + end + depfiles += [ install_path ] + end +@@ -127,16 +127,16 @@ task :clean do + desc "clean all built and in-repo installed artifacts" + task :clean do + MRuby.each_target do |t| +- FileUtils.rm_rf t.build_dir, { :verbose => $verbose } ++ FileUtils.rm_rf t.build_dir, verbose: $verbose + end +- FileUtils.rm_f depfiles, { :verbose => $verbose } ++ FileUtils.rm_f depfiles, verbose: $verbose + puts "Cleaned up target build folder" + end + + desc "clean everything!" + task :deep_clean => ["clean"] do + MRuby.each_target do |t| +- FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose } ++ FileUtils.rm_rf t.gem_clone_dir, verbose: $verbose + end + puts "Cleaned up mrbgems build folder" + end