<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/489485138db37b2136dc435b47ea23408cb08c65">https://github.com/macports/macports-ports/commit/489485138db37b2136dc435b47ea23408cb08c65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 489485138db37b2136dc435b47ea23408cb08c65
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 29 12:25:10 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> makefile PG: remove trailing whitespace
</span>---
_resources/port1.0/group/makefile-1.0.tcl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/makefile-1.0.tcl b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a14bf791bc..27b352b9490 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/makefile-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ proc makefile_pg::setup_phase {phase} {
</span> if {[lsearch -exact ${makefile.override} SDKROOT] != -1 && [option configure.sdkroot] ne ""} {
${phase}.args-append SDKROOT=[option configure.sdkroot]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #########################################################################################
# attempt to set PREFIX variable
#########################################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +107,7 @@ proc makefile_pg::setup_phase {phase} {
</span> ${phase}.args-append [option makefile.prefix_name]=[shellescape ${makefile_prefix}]
}
${phase}.env-append [option makefile.prefix_name]=${makefile_prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #########################################################################################
# replicate behavior in procedure portconfigure::configure_main
# see https://github.com/macports/macports-base/blob/master/src/port1.0/portconfigure.tcl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,7 @@ proc makefile_pg::setup_phase {phase} {
</span> }
configure.ldflags-append "-Wl,-syslibroot,[option configure.sdkroot]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![exists universal_archs_supported] || ![variant_exists universal] || ![variant_isset universal]} {
# muniversal PG is *not* being used
foreach tool {cc f77 cxx objc objcxx cpp f90 fc ld} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +174,7 @@ proc makefile_pg::setup_phase {phase} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {![variant_exists universal] || ![variant_isset universal]} {
foreach env_var {CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FFLAGS F90FLAGS FCFLAGS LDFLAGS} {
if {[option configure.march] ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,7 +185,7 @@ proc makefile_pg::setup_phase {phase} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach env_var { \
CC CXX OBJC OBJCXX FC F77 F90 JAVAC \
CFLAGS CPPFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,7 +200,7 @@ proc makefile_pg::setup_phase {phase} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach env_var { \
PKG_CONFIG_PATH \
} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,7 +212,7 @@ proc makefile_pg::setup_phase {phase} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} == 12} {
${phase}.env-append __CFPREFERENCES_AVOID_DAEMON=1
if {[lsearch -exact ${makefile.override} __CFPREFERENCES_AVOID_DAEMON] != -1} {
</pre><pre style='margin:0'>
</pre>