From nobody Sun Sep 15 20:16:12 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 4X6K7J6L67z5WtQp; Sun, 15 Sep 2024 20:16:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X6K7J2Hhtz43fl; Sun, 15 Sep 2024 20:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726431372; 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=qVdv7gv5sxqMl8q/i7AD6Gh0+JiEMB6eCBsWLDXShUk=; b=e/9b4DpnTmY2oprcrz+ZZ5UTt7rtvN10SqGrXPKAl8yoXn7zHSEzYzfFHNeTxA80HLDEuj oGuTsT46I9fafk0B9H0C0BRkop/kbfSgese6KrasgUVCz93vpyd5ejV7vitNVcDWxAmUmB qNXTc8+UV9VseyAOMCS28JWfQl0xDeSQ6KsRfah+znD/QS07/GZymvLGR1i8kvWL5OAiPT GNh4p2NifrOO2tYLp6vtHZTyznbD/uYZl4kqMwWTJB6F/N481wLNruDnYIUsxNrW0MQqmf DoEOB4pkFWaU9Yy6d/MUdEsoNUTWh347SlvsiVPFzs3WDfMFwdafut6sYzQLOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726431372; a=rsa-sha256; cv=none; b=ihAk0hsLRAr8kbGiwhfe7Xzkuib4WM2eYQDISi7wmb7XoJ3WMaf0IhBn1DchPd2bgXOWfl +KsUSWQmhkUvo8Td9UGLTYfmJfBAgLX9wYlClYBaes9e7Asv56FWNSxxRhbDW5NOgPBOtu 6kn8jnmwpVqljm62J0rcyZJ8tuRNMEGf5hJKdKZAmPEgYT+FGopRLCGoNxD9jxVlLyUs+3 ariJ9JJAe5gqeWuh5F9PT+FEAzgwvw41J+MQzlr2j4Aavhvd+5zLcfyrOmwGh836d0AL9p rgf9Z//yMNE9U0KwrSrYah8H1jwedLPPMYoKcvNgFKf8a6b9WP+5+g+pd/6Zrg== 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=1726431372; 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=qVdv7gv5sxqMl8q/i7AD6Gh0+JiEMB6eCBsWLDXShUk=; b=bNPAavMejf9D7Z0bPaVqbnqZUaiNqDo5uo2L6DTU8A3BEjqebqlxRGxAuK3eKmf3i8dfmm /sjLhbSb3t/B7N3B4101kGNh74ZTvx17LQ/KQgxl3k3lmHrlgCBidO6X8IEC3TYrx9MvzT dc7i1Bu1wHLQ5vFUSSwK86ReYiLEoBZjYl/JDkVPQl0uARAAUNXjneTfSnWQnIM4nA+3WP QH0FMkdjZjS23NV/ZqTky/OrsufUoSGwVOhdYHXVge/pVvStIOE/dzH/pPfzgs4Sore0V/ n1+qsI350Xg/Wmb6jXxcQpHMC2Uv+RG6Ysl6ubAaSHMHvQW0dr6NwRUUn7QgnQ== 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 4X6K7J1vYyzPcm; Sun, 15 Sep 2024 20:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FKGCOu081981; Sun, 15 Sep 2024 20:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FKGCso081978; Sun, 15 Sep 2024 20:16:12 GMT (envelope-from git) Date: Sun, 15 Sep 2024 20:16:12 GMT Message-Id: <202409152016.48FKGCso081978@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ae96d3af77c4 - main - lang/p5-JavaScript-QuickJS: Minimize patch file 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae96d3af77c4f8624da9dea28f48c17f6aa72106 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae96d3af77c4f8624da9dea28f48c17f6aa72106 commit ae96d3af77c4f8624da9dea28f48c17f6aa72106 Author: Po-Chuan Hsieh AuthorDate: 2024-09-15 19:43:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-15 20:09:42 +0000 lang/p5-JavaScript-QuickJS: Minimize patch file --- lang/p5-JavaScript-QuickJS/files/patch-Makefile.PL | 56 ++++++---------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/lang/p5-JavaScript-QuickJS/files/patch-Makefile.PL b/lang/p5-JavaScript-QuickJS/files/patch-Makefile.PL index 99174c1a1b57..40f373972a22 100644 --- a/lang/p5-JavaScript-QuickJS/files/patch-Makefile.PL +++ b/lang/p5-JavaScript-QuickJS/files/patch-Makefile.PL @@ -1,23 +1,15 @@ --- Makefile.PL.orig 2024-02-12 06:16:14 UTC +++ Makefile.PL -@@ -13,24 +13,11 @@ use Cwd; +@@ -13,7 +13,7 @@ use Cwd; use File::Which; use Cwd; -my $GMAKE_PATH = _find_gmake(); -- --if (!$GMAKE_PATH) { -- die "GNU Make ($Config{'gmake'}) is required.\n"; --} --elsif (!-x $GMAKE_PATH) { -- if ($!) { -- die "Failed to detect if GNU Make ($GMAKE_PATH) is executable: $!\n"; -- } -- -- die "GNU Make ($GMAKE_PATH) is not executable.\n"; --} -- - my $ATOMIC_ENV_KEY = 'JS_QUICKJS_LINK_LIBATOMIC'; ++my $GMAKE_PATH = "/usr/bin/make"; + + if (!$GMAKE_PATH) { + die "GNU Make ($Config{'gmake'}) is required.\n"; +@@ -30,7 +30,7 @@ my $PERL_QJS_MAKEFILE_PATH = File::Spec->catfile( Cwd: my $PERL_QJS_MAKEFILE_PATH = File::Spec->catfile( Cwd::getcwd(), 'Makefile.quickjs'); @@ -26,7 +18,7 @@ # quickjs needs these; pre-5.20 perls didn’t include libpthread. # Note that MSWin32, if given these, will try to compile them statically -@@ -42,8 +29,6 @@ if (_need_librt()) { +@@ -42,8 +42,6 @@ if (_need_librt()) { push @libs, '-lrt'; } @@ -35,7 +27,7 @@ if (!_stdatomic_h_exists()) { _avoid_stdatomic_h(); } -@@ -54,13 +39,6 @@ mkdir( File::Spec->catdir( qw(quickjs .obj) ) ); +@@ -54,13 +52,6 @@ mkdir( File::Spec->catdir( qw(quickjs .obj) ) ); # mkdir( File::Spec->catdir( qw(quickjs .obj) ) ); @@ -49,7 +41,7 @@ WriteMakefile( NAME => 'JavaScript::QuickJS', VERSION_FROM => 'lib/JavaScript/QuickJS.pm', # finds $VERSION -@@ -71,7 +49,7 @@ WriteMakefile( +@@ -71,7 +62,7 @@ WriteMakefile( ], ) : () ), @@ -58,31 +50,11 @@ LICENSE => "perl_5", PMLIBDIRS => ['lib'], -@@ -224,8 +202,6 @@ sub _should_link_libatomic { - my $needs_libatomic; - - eval { -- system $GMAKE_PATH, '-C', 'quickjs', '-f', $PERL_QJS_MAKEFILE_PATH, $rel_objpath; -- die if $?; - my $objbin = File::Slurper::read_binary($objpath); +@@ -325,7 +316,6 @@ $libpath: + return <<"MAKE_FRAG" - $needs_libatomic = -1 != index($objbin, '__atomic_fetch_sub_'); -@@ -315,18 +291,5 @@ use Config; - package MY; - - use Config; -- --sub postamble { -- -- # QuickJS requires GNU make. -- my $make = ($^O =~ mi) ? $GMAKE_PATH : '$(MAKE)'; -- -- # The leading “+” is to ensure that parallel builds work properly. -- return <<"MAKE_FRAG" -- --$libpath: + $libpath: -\t+$make -C quickjs -f '$PERL_QJS_MAKEFILE_PATH' libquickjs.a --MAKE_FRAG --} + MAKE_FRAG + } - 1;