git: 33b05a16fc03 - main - lang/perl5*: remove workarounds for lld 15 and dtrace enabled

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Mon, 12 Dec 2022 13:35:06 UTC
The branch main has been updated by dim (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=33b05a16fc0346ecdf0206438bd9efe995339bee

commit 33b05a16fc0346ecdf0206438bd9efe995339bee
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-12-12 13:30:34 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
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