From nobody Mon Dec 12 13:35:06 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 4NW2gH10L0z4kQWW; Mon, 12 Dec 2022 13:35:07 +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 4NW2gH0VnWz4D3g; Mon, 12 Dec 2022 13:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670852107; 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=rn1WT/wSQtYVjgrIf2T53B/Tgbbzf+XIrV5z/0WdzBs=; b=L2KyqFLqweHWfmMaM662TrPtEA2jF9PTO4i/qaaBhkEIPhtSfiSlu8+sku6tew7dhCaW4s Q208uPsO45DsK10CA0uUgGKkZVGoZ8u88oy10mQOVFQ0nQHa+E6wRcFyeM3LvTyGxuA/oU UGK5l3mUnBuYrU6o2v1Wz1HkcvEELevrxji7mxXGOPGjdSlasAX6voHZwlh6qA9suGuAlH x/1a6nKE2LuSJZ+qRd+NwL5olvf120nNqG7SOZr4mBb+xIZ0hq9uUuyZjtKaCsLxV4WudR KjrUqwfdCV5u8+UchC576NZKwn5SOqtIbna7GEwueTODik1+KgXgCXgFB//Bww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670852107; 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=rn1WT/wSQtYVjgrIf2T53B/Tgbbzf+XIrV5z/0WdzBs=; b=CJ3Rggds2gClrs20eYNKBg3jWRolMG+/Iuegwlc9sy6rYBmRle801H1cNsjrJ2H0Wzqy93 HckMeyLAa6XAUfiVmRnY4tDacxoC4g/0Ee69GWVSIacPH4EY3UHIC1xLfe7KxnXG9gNwl5 NFNmE+J5tzl1BnuDb5rijofiqp9UnzKB+PyLScxILeoDNFjPwF5GVO/ET24VjQvbJzBBeg om+jTZDM0NFmUJrF3rw+dz+wuwRDC5Ef/kcmI9zXW6Lh70Fe83YnoNw4qbq2B8cTsqxXUT cAtcbskFprEuIHNnC0fTJXaqXSAnfE58wksWZNKRt6Kh/iRaRr6BbSgLMzXGaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670852107; a=rsa-sha256; cv=none; b=CcEBwSc1G5rixtWyn7we26aQrT9yhkpdNEr7KulfTrodjVr1idKIvoyk3HsYJQKWoacl+9 eycvDFjLkcdBug/wa22AeOuFtNVtKzqZvXj6EuVirJMok2X9MMfEDe7Sadni81YXQCAjpn OK7JuUDzlwifek3LmCPuFYoA97a1uHgZBJSUnUCjjVtsZVKY1gczysOGRvGrBOeRLlNzXG y0HNAIPcEmCI0v0V8UY6Ru8BflmJ1EztUXnSXawNg7FqLbpuW4Els+mHmGX+SPcBvnS2f9 G5LiI4+nQRwCiOSQVAydPbrQKTctUJ8kLMC9rHtTjiJD/gpl4lsdt837K14uwQ== 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 4NW2gG6XpMzc0C; Mon, 12 Dec 2022 13:35:06 +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 2BCDZ6BB085472; Mon, 12 Dec 2022 13:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BCDZ68Z085471; Mon, 12 Dec 2022 13:35:06 GMT (envelope-from git) Date: Mon, 12 Dec 2022 13:35:06 GMT Message-Id: <202212121335.2BCDZ68Z085471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 33b05a16fc03 - main - lang/perl5*: remove workarounds for lld 15 and dtrace 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33b05a16fc0346ecdf0206438bd9efe995339bee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=33b05a16fc0346ecdf0206438bd9efe995339bee commit 33b05a16fc0346ecdf0206438bd9efe995339bee Author: Dimitry Andric AuthorDate: 2022-12-12 13:30:34 +0000 Commit: Dimitry Andric CommitDate: 2022-12-12 13:34:48 +0000 lang/perl5*: remove workarounds for lld 15 and dtrace enabled After https://cgit.freebsd.org/src/commit/?id=be39466a1035, there is no need anymore to patch the perl5 Makefiles to add "-Wl,--allow-multiple-definition" to the linker flags. They should now link with lld 15 and later without any issues. PR: 265516 Fixes: 8c69fc20e6c7 MFH: 2022Q4 --- lang/perl5-devel/files/patch-Makefile.SH | 18 ------------------ lang/perl5.32/files/patch-Makefile.SH | 18 ------------------ lang/perl5.34/files/patch-Makefile.SH | 18 ------------------ lang/perl5.36/files/patch-Makefile.SH | 18 ------------------ 4 files changed, 72 deletions(-) diff --git a/lang/perl5-devel/files/patch-Makefile.SH b/lang/perl5-devel/files/patch-Makefile.SH index b2a2691d922c..f5dfc3bd2a60 100644 --- a/lang/perl5-devel/files/patch-Makefile.SH +++ b/lang/perl5-devel/files/patch-Makefile.SH @@ -10,21 +10,3 @@ Allow customisation of shrpldflags. ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL' -@@ -924,7 +923,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLE - true) - $spitshell >>$Makefile <<'!NO!SUBS!' - rm -f $@ -- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -+ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,--allow-multiple-definition $(perllib_objs) $(DYNALOADER) $(libs) - !NO!SUBS! - case "$osname" in - aix) -@@ -1015,7 +1014,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep) write_buildc - $spitshell >>$Makefile <<'!NO!SUBS!' - lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl - -@rm -f miniperl.xok -- $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ -+ $(CC) $(CLDFLAGS) -Wl,--allow-multiple-definition -o $(MINIPERL_EXE) \ - $(miniperl_objs) $(libs) - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' - $(MINIPERL) -f write_buildcustomize.pl diff --git a/lang/perl5.32/files/patch-Makefile.SH b/lang/perl5.32/files/patch-Makefile.SH index d832116aa1fb..fbb95351ea33 100644 --- a/lang/perl5.32/files/patch-Makefile.SH +++ b/lang/perl5.32/files/patch-Makefile.SH @@ -10,21 +10,3 @@ Allow customisation of shrpldflags. ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL' -@@ -932,7 +931,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLE - true) - $spitshell >>$Makefile <<'!NO!SUBS!' - rm -f $@ -- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -+ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,--allow-multiple-definition $(perllib_objs) $(DYNALOADER) $(libs) - !NO!SUBS! - case "$osname" in - aix) -@@ -1038,7 +1037,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep) write_buildc - $spitshell >>$Makefile <<'!NO!SUBS!' - lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl - -@rm -f miniperl.xok -- $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ -+ $(CC) $(CLDFLAGS) -Wl,--allow-multiple-definition -o $(MINIPERL_EXE) \ - $(miniperl_objs) $(libs) - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' - $(MINIPERL) -f write_buildcustomize.pl diff --git a/lang/perl5.34/files/patch-Makefile.SH b/lang/perl5.34/files/patch-Makefile.SH index 94a9d7fc6812..a4df75abc192 100644 --- a/lang/perl5.34/files/patch-Makefile.SH +++ b/lang/perl5.34/files/patch-Makefile.SH @@ -10,21 +10,3 @@ Allow customisation of shrpldflags. ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL' -@@ -932,7 +931,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLE - true) - $spitshell >>$Makefile <<'!NO!SUBS!' - rm -f $@ -- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -+ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,--allow-multiple-definition $(perllib_objs) $(DYNALOADER) $(libs) - !NO!SUBS! - case "$osname" in - aix) -@@ -1038,7 +1037,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep) write_buildc - $spitshell >>$Makefile <<'!NO!SUBS!' - lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl - -@rm -f miniperl.xok -- $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ -+ $(CC) $(CLDFLAGS) -Wl,--allow-multiple-definition -o $(MINIPERL_EXE) \ - $(miniperl_objs) $(libs) - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' - $(MINIPERL) -f write_buildcustomize.pl diff --git a/lang/perl5.36/files/patch-Makefile.SH b/lang/perl5.36/files/patch-Makefile.SH index 2fd3f4a0b091..ad2e28b41b37 100644 --- a/lang/perl5.36/files/patch-Makefile.SH +++ b/lang/perl5.36/files/patch-Makefile.SH @@ -10,21 +10,3 @@ Allow customisation of shrpldflags. ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' DPERL_IS_MINIPERL='-DPERL_IS_MINIPERL' -@@ -924,7 +923,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLE - true) - $spitshell >>$Makefile <<'!NO!SUBS!' - rm -f $@ -- $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) -+ $(LD) -o $@ $(SHRPLDFLAGS) -Wl,--allow-multiple-definition $(perllib_objs) $(DYNALOADER) $(libs) - !NO!SUBS! - case "$osname" in - aix) -@@ -1015,7 +1014,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep) write_buildc - $spitshell >>$Makefile <<'!NO!SUBS!' - lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl - -@rm -f miniperl.xok -- $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ -+ $(CC) $(CLDFLAGS) -Wl,--allow-multiple-definition -o $(MINIPERL_EXE) \ - $(miniperl_objs) $(libs) - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' - $(MINIPERL) -f write_buildcustomize.pl