diff options
Diffstat (limited to 'lang/perl5.34/files/patch-Makefile.SH')
| -rw-r--r-- | lang/perl5.34/files/patch-Makefile.SH | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/lang/perl5.34/files/patch-Makefile.SH b/lang/perl5.34/files/patch-Makefile.SH index c65b5dfc7a30..94a9d7fc6812 100644 --- a/lang/perl5.34/files/patch-Makefile.SH +++ b/lang/perl5.34/files/patch-Makefile.SH @@ -1,8 +1,8 @@ Allow customisation of shrpldflags. ---- Makefile.SH.orig 2015-09-08 05:21:36 UTC +--- Makefile.SH.orig 2022-02-26 18:50:37 UTC +++ Makefile.SH -@@ -40,7 +40,6 @@ esac +@@ -40,7 +40,6 @@ linklibperl_nonshr='' pwd="`pwd`" linklibperl='$(LIBPERL)' linklibperl_nonshr='' @@ -10,3 +10,21 @@ 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 |