| 1 |
commit: ce90900a0ff16326fd1f2608d32ad2c4e294b89f |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 25 13:06:39 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 25 13:07:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce90900a |
| 7 |
|
| 8 |
dev-lang/perl-5.34.0-r6: fix build on Darwin 9 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/perl/perl-5.34.0-r6.ebuild | 12 ++++++++++-- |
| 14 |
1 file changed, 10 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/perl/perl-5.34.0-r6.ebuild b/dev-lang/perl/perl-5.34.0-r6.ebuild |
| 17 |
index c5e33db0b272..10a8bdee8bdb 100644 |
| 18 |
--- a/dev-lang/perl/perl-5.34.0-r6.ebuild |
| 19 |
+++ b/dev-lang/perl/perl-5.34.0-r6.ebuild |
| 20 |
@@ -430,6 +430,12 @@ src_prepare() { |
| 21 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 22 |
# fix install_name (soname) not to reference $D |
| 23 |
sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die |
| 24 |
+ |
| 25 |
+ # fix environ linkage absence (only a real issue on Darwin9) |
| 26 |
+ if [[ ${CHOST##*-darwin} -le 9 ]] ; then |
| 27 |
+ sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \ |
| 28 |
+ Makefile.SH || die |
| 29 |
+ fi |
| 30 |
fi |
| 31 |
|
| 32 |
default |
| 33 |
@@ -614,9 +620,11 @@ src_configure() { |
| 34 |
myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)" |
| 35 |
|
| 36 |
# Older macOS with non-Apple GCC chokes on inline in system headers |
| 37 |
- # using c89 mode as injected by cflags.SH |
| 38 |
+ # using c89 mode as injected by cflags.SH, in addition, we override |
| 39 |
+ # cflags, so we loose PERL_DARWIN which enables compat code that |
| 40 |
+ # apparently on more recent macOS releases is no longer necessary |
| 41 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
| 42 |
- append-cflags -Dinline=__inline__ |
| 43 |
+ append-cflags -Dinline=__inline__ -DPERL_DARWIN |
| 44 |
|
| 45 |
# flock on 32-bit sparc Solaris is broken, fall back to fcntl |
| 46 |
[[ ${CHOST} == sparc-*-solaris* ]] && \ |
Archives