From nobody Mon Sep 19 18:58:04 2022 X-Original-To: dev-commits-ports-all@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 4MWYph3vHMz4cW1c; Mon, 19 Sep 2022 18:58:04 +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 4MWYph3N2jz3q99; Mon, 19 Sep 2022 18:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663613884; 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=QNUOhuvLSMBEjykphfjuX0j2GD/ydZEcicT/ljGUjTM=; b=dIoDRAaX2cn7UVg25caRA9cHX9QgVGZl70dWD08jEoIaePTJYCvKQGvJvr4ky1GxXEhsLi NqW4B+pb0IUMZqs+PZ75CJM75E43tT/vhqdHsyBMDnjJQlwyfZXfaKMMEaHRYo4zAj/AbL ayON88f4yboSpkukulG0Pfq7nvMb4KUeOaqi+rDJxftDfQcuKZ+N+IU1+Q1cqC+KQ5lg4m QTTVZ7T6KyZGo5CPJ6WJOOk+VDjnXCQg4jl6urhFUVyy/iRlOf0Lfwjj20I9JntX9ogq8z kpWdYEXgBO3sF0Xgex8oqG+6AFCFPtfGIkdtKJPP4X3LcuV9yN8qxkSCGT1YIQ== 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 4MWYph2SckzT8N; Mon, 19 Sep 2022 18:58:04 +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 28JIw4nN086912; Mon, 19 Sep 2022 18:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JIw4j8086911; Mon, 19 Sep 2022 18:58:04 GMT (envelope-from git) Date: Mon, 19 Sep 2022 18:58:04 GMT Message-Id: <202209191858.28JIw4j8086911@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: 4ae8ff941b29 - main - lang/perl5*: work around duplicate symbol errors with lld 15 and dtrace enabled List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4ae8ff941b29191641e22a06e39ea27aa38c7848 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663613884; 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=QNUOhuvLSMBEjykphfjuX0j2GD/ydZEcicT/ljGUjTM=; b=r8VLa19FYN/QZknY9rzhRuVerkoKdKeWS/vnU8vIwDgZQ7CLDZua5xZrzAZ2k6DS1nuFnv 1qfK47nWUJH2Rh3XG/IGGgu1OW4e4IGO54b6mTtll6A/31L9z8g2uYr30TsUTGgd/5FOyC XxeiFMpyaCf8xExFgll9ORAT6XAifKfjdCF6LHs1q5O4/vyxr84McbDJb2cifCpswTN5hR Kx+mL8Rv7c7KhNXn488BUlWcGgyMMMZyJen9NEB01VCb9Is5JKGAInTDH7S9/N/wJOK0UO rzGKh3a+c70dN0sZhV5o0odgyeY91LbU8l7tkAls57otXxSgIPut68NnzZGiTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663613884; a=rsa-sha256; cv=none; b=kGTlNQJ1Lc2/0q2iJ6SbpAe9HFDZT93QwJ1i3CBlDsVwFlDZ+94PIEnCsjqF4hpZTA+emK cIANtWO9DzZubHvE8vPU1722/PTJ3QWGuo2XdmQe/JvzB8K9W+IRQS5UgllvCz5rcknNap bUBPoBupyxJYjf2d28/wbv7vnCSfS7uVERPWllNlRDiWkZzGS/p+J6Mu0khj9P2dYWD3Zr AJ30ZzfenarwcNgqw+jmd69TbEMk+h+3CtJYRmDf3uJuAIecS6GK9Jyi1LAN0ucmheXPTI mgGGwPmVyQuiWHymgQwpTtybzeRFgNoEBV90T8eu1lYkADcBNLyZ4At5VbaFcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae8ff941b29191641e22a06e39ea27aa38c7848 commit 4ae8ff941b29191641e22a06e39ea27aa38c7848 Author: Dimitry Andric AuthorDate: 2022-09-19 18:54:14 +0000 Commit: Dimitry Andric CommitDate: 2022-09-19 18:54:14 +0000 lang/perl5*: work around duplicate symbol errors with lld 15 and dtrace enabled Building any of the lang/perl5* ports with clang and lld 15, and the DTRACE option enabled (which is default on) results in link errors similar to: cc -pthread -Wl,-E -fstack-protector-strong -L/usr/local/lib -o miniperl mpdtrace/opmini.o mpdtrace/perlmini.o mpdtrace/universalmini.o mpdtrace/gv.o mpdtrace/toke.o mpdtrace/perly.o mpdtrace/pad.o mpdtrace/regcomp.o mpdtrace/dump.o mpdtrace/util.o mpdtrace/mg.o mpdtrace/reentr.o mpdtrace/mro_core.o mpdtrace/keywords.o mpdtrace/builtin.o mpdtrace/hv.o mpdtrace/av.o mpdtrace/run.o mpdtrace/pp_hot.o mpdtrace/sv.o mpdtrace/pp.o mpdtrace/scope.o mpdtrace/pp_ctl.o mpdtrace/pp_sys.o mpdtrace/doop.o mpdtrace/doio.o mpdtrace/regexec.o mpdtrace/utf8.o mpdtrace/taint.o mpdtrace/deb.o mpdtrace/globals.o mpdtrace/perlio.o mpdtrace/numeric.o mpdtrace/mathoms.o mpdtrace/locale.o mpdtrace/pp_pack.o mpdtrace/pp_sort.o mpdtrace/caretx.o mpdtrace/dquote.o mpdtrace/time64.o mpdtrace/miniperlmain.o dtrace_mini.o -lpthread -lm -lcrypt -lutil ld: error: duplicate symbol: __dtraceenabled_perl___sub__entry >>> defined in mpdtrace/pp_hot.o >>> defined in mpdtrace/pp_sort.o ld: error: duplicate symbol: __dtraceenabled_perl___sub__entry >>> defined in mpdtrace/pp_hot.o >>> defined in mpdtrace/regexec.o ld: error: duplicate symbol: __dtraceenabled_perl___op__entry >>> defined in mpdtrace/perlmini.o >>> defined in mpdtrace/run.o ld: error: duplicate symbol: __dtraceenabled_perl___op__entry >>> defined in mpdtrace/perlmini.o >>> defined in mpdtrace/dump.o ld: error: duplicate symbol: __dtraceenabled_perl___sub__entry >>> defined in mpdtrace/pp_hot.o >>> defined in mpdtrace/pp_ctl.o cc: error: linker command failed with exit code 1 (use -v to see invocation) Work around these errors by allowing multiple definitions during linking, using the --allow-multiple-definition linker flag. (Note: this flag is also supported by GNU ld.) PR: 265516 Approved by: maintainer timeout (1 month) MFH: 2022Q3 --- lang/perl5-devel/Makefile | 2 +- lang/perl5-devel/files/patch-hints_freebsd.sh | 13 ++++++++++++- lang/perl5.32/Makefile | 2 +- lang/perl5.32/files/patch-hints_freebsd.sh | 13 ++++++++++++- lang/perl5.34/Makefile | 2 +- lang/perl5.34/files/patch-hints_freebsd.sh | 13 ++++++++++++- lang/perl5.36/Makefile | 2 +- lang/perl5.36/files/patch-hints_freebsd.sh | 13 ++++++++++++- 8 files changed, 52 insertions(+), 8 deletions(-) diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index da16b99f4431..e8a750695e78 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -4,7 +4,7 @@ PORTNAME= perl DISTVERSIONPREFIX= v DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} DISTVERSIONSUFFIX= ${GH_TAGNAME:C/.*-g/-g/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 # XXX Leave only CPAN. MASTER_SITES= LOCAL/mat/perl \ diff --git a/lang/perl5-devel/files/patch-hints_freebsd.sh b/lang/perl5-devel/files/patch-hints_freebsd.sh index efcbcfea109d..359ca12088c1 100644 --- a/lang/perl5-devel/files/patch-hints_freebsd.sh +++ b/lang/perl5-devel/files/patch-hints_freebsd.sh @@ -1,6 +1,6 @@ Remove libs that are not here on FreeBSD. ---- hints/freebsd.sh.orig 2016-12-05 10:28:13 UTC +--- hints/freebsd.sh.orig 2022-06-19 19:29:35 UTC +++ hints/freebsd.sh @@ -88,6 +88,8 @@ case "$osvers" in esac @@ -22,3 +22,14 @@ Remove libs that are not here on FreeBSD. ;; esac +@@ -142,8 +148,8 @@ case "$osvers" in + *) + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " +- lddlflags="-shared " ++ ldflags="-Wl,-E,--allow-multiple-definition" ++ lddlflags="-shared -Wl,--allow-multiple-definition" + cccdlflags='-DPIC -fPIC' + ;; + esac diff --git a/lang/perl5.32/Makefile b/lang/perl5.32/Makefile index d83f6b8d86ad..fb99eef6dae8 100644 --- a/lang/perl5.32/Makefile +++ b/lang/perl5.32/Makefile @@ -1,6 +1,6 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.32/files/patch-hints_freebsd.sh b/lang/perl5.32/files/patch-hints_freebsd.sh index efcbcfea109d..735ec399fc3d 100644 --- a/lang/perl5.32/files/patch-hints_freebsd.sh +++ b/lang/perl5.32/files/patch-hints_freebsd.sh @@ -1,6 +1,6 @@ Remove libs that are not here on FreeBSD. ---- hints/freebsd.sh.orig 2016-12-05 10:28:13 UTC +--- hints/freebsd.sh.orig 2020-12-18 09:58:48 UTC +++ hints/freebsd.sh @@ -88,6 +88,8 @@ case "$osvers" in esac @@ -22,3 +22,14 @@ Remove libs that are not here on FreeBSD. ;; esac +@@ -142,8 +148,8 @@ case "$osvers" in + *) + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " +- lddlflags="-shared " ++ ldflags="-Wl,-E,--allow-multiple-definition" ++ lddlflags="-shared -Wl,--allow-multiple-definition" + cccdlflags='-DPIC -fPIC' + ;; + esac diff --git a/lang/perl5.34/Makefile b/lang/perl5.34/Makefile index cfd72badd293..69537f04f532 100644 --- a/lang/perl5.34/Makefile +++ b/lang/perl5.34/Makefile @@ -1,6 +1,6 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.34/files/patch-hints_freebsd.sh b/lang/perl5.34/files/patch-hints_freebsd.sh index efcbcfea109d..5709b2f3358d 100644 --- a/lang/perl5.34/files/patch-hints_freebsd.sh +++ b/lang/perl5.34/files/patch-hints_freebsd.sh @@ -1,6 +1,6 @@ Remove libs that are not here on FreeBSD. ---- hints/freebsd.sh.orig 2016-12-05 10:28:13 UTC +--- hints/freebsd.sh.orig 2022-02-19 12:15:55 UTC +++ hints/freebsd.sh @@ -88,6 +88,8 @@ case "$osvers" in esac @@ -22,3 +22,14 @@ Remove libs that are not here on FreeBSD. ;; esac +@@ -142,8 +148,8 @@ case "$osvers" in + *) + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " +- lddlflags="-shared " ++ ldflags="-Wl,-E,--allow-multiple-definition" ++ lddlflags="-shared -Wl,--allow-multiple-definition" + cccdlflags='-DPIC -fPIC' + ;; + esac diff --git a/lang/perl5.36/Makefile b/lang/perl5.36/Makefile index 37b04294c175..eacaa878d387 100644 --- a/lang/perl5.36/Makefile +++ b/lang/perl5.36/Makefile @@ -1,6 +1,6 @@ PORTNAME= perl DISTVERSION= ${PERL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN/../../src/5.0 DIST_SUBDIR= perl diff --git a/lang/perl5.36/files/patch-hints_freebsd.sh b/lang/perl5.36/files/patch-hints_freebsd.sh index efcbcfea109d..8401474feca7 100644 --- a/lang/perl5.36/files/patch-hints_freebsd.sh +++ b/lang/perl5.36/files/patch-hints_freebsd.sh @@ -1,6 +1,6 @@ Remove libs that are not here on FreeBSD. ---- hints/freebsd.sh.orig 2016-12-05 10:28:13 UTC +--- hints/freebsd.sh.orig 2020-12-28 16:57:44 UTC +++ hints/freebsd.sh @@ -88,6 +88,8 @@ case "$osvers" in esac @@ -22,3 +22,14 @@ Remove libs that are not here on FreeBSD. ;; esac +@@ -142,8 +148,8 @@ case "$osvers" in + *) + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " +- lddlflags="-shared " ++ ldflags="-Wl,-E,--allow-multiple-definition" ++ lddlflags="-shared -Wl,--allow-multiple-definition" + cccdlflags='-DPIC -fPIC' + ;; + esac