<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2d54435f35507bbd16af545376070b0234ba5521">https://github.com/macports/macports-ports/commit/2d54435f35507bbd16af545376070b0234ba5521</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2d54435f355 g95: Set MACOSX_DEPLOYMENT_TARGET
</span>2d54435f355 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2d54435f35507bbd16af545376070b0234ba5521
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Dec 12 21:02:16 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> g95: Set MACOSX_DEPLOYMENT_TARGET
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64188
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use system's -W argument instead of running cd manually.
</span>---
lang/g95/Portfile | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/g95/Portfile b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 114e1f24fa1..e4f136beb80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,8 +85,8 @@ use_parallel_build no
</span> extract.only ${dg95}
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "tar jxvf ${distpath}/${dcore} -C ${workpath}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${worksrcpath}; tar zxvf libf95.a-${version}.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "tar jxvf ${distpath}/${dcore}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "tar zxvf libf95.a-${version}.tar.gz"
</span> }
pre-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,14 +113,15 @@ pre-configure {
</span> }
# set gcc_configargs "--with-as=/usr/bin/as --with-ld=/usr/bin/ld --with-nm=/usr/bin/nm"
# set gcc_configargs "--with-as=${prefix}/bin/as --with-ld=${prefix}/bin/ld --with-nm=${prefix}/bin/nm"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "export CC=\"${configure.cc}\"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/gcc-${version_gcc}/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export CC=\"${configure.cc}\"; \
</span> export CPPFLAGS=\"${configure.cppflags}\"; \
export CFLAGS=\"${configure.cflags} ${configure.cc_archflags}\"; \
export CFLAGS_FOR_BUILD=\"${configure.cflags} ${configure.cc_archflags}\"; \
export CFLAGS_FOR_TARGET=\"${configure.cflags}\"; \
export LDFLAGS=\"${configure.ldflags} ${configure.cc_archflags}\"; \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ export MACOSX_DEPLOYMENT_TARGET=\"${macosx_deployment_target}\"; \
</span> export MAKEINFO=missing;\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${workpath}/gcc-${version_gcc}/${name}; \
</span> ../configure --prefix=${prefix}/${gcclib} \
--enable-languages=c \
--disable-multilib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,10 +134,10 @@ pre-configure {
</span> ${buildhost}; \
make"
if {![variant_isset gcc40]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${workpath}/gcc-${version_gcc}/${name}/gcc; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar d libbackend.a options.o; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${workpath}/gcc-${version_gcc}/gcc/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch -p0 < ${filespath}/patch-gcc.c.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/gcc-${version_gcc}/${name}/gcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ar d libbackend.a options.o"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/gcc-${version_gcc}/gcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "patch -p0 < ${filespath}/patch-gcc.c.diff"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,16 +156,17 @@ pre-build {
</span> }
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/libf95.a-${version}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export CC=\"${configure.cc}\"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/libf95.a-${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export CC=\"${configure.cc}\"; \
</span> export CFLAGS=\"${configure.cflags} ${configure.cc_archflags}\"; \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ export MACOSX_DEPLOYMENT_TARGET=\"${macosx_deployment_target}\"; \
</span> ./configure --prefix=${prefix} ${buildhost}; \
make"
}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/libf95.a-${version}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- make install DESTDIR=${destroot}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/libf95.a-${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "make install DESTDIR=${destroot}; \
</span> ranlib ${destroot}${prefix}/${gcclib}/libf95.a; \
ranlib ${destroot}${prefix}/${gcclib}/libgcc.a; \
ranlib ${destroot}${prefix}/${gcclib}/libgcc_eh.a"
</pre><pre style='margin:0'>
</pre>