Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
gcc*: remove trailing whitespace
  • Loading branch information
MarcusCalhoun-Lopez committed Jan 20, 2020
1 parent 16ea8bb commit 6428e9a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions lang/gcc10/Portfile
Expand Up @@ -215,12 +215,12 @@ if {${subport} eq "libgcc-devel"} {
#build.target all

post-destroot {

file mkdir ${destroot}${prefix}/lib/libgcc.merged

# loop over libs to install
foreach dylib ${dylibs} {

# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
# https://trac.macports.org/ticket/40098
# https://trac.macports.org/ticket/40100
Expand Down
2 changes: 1 addition & 1 deletion lang/gcc6/Portfile
Expand Up @@ -58,7 +58,7 @@ if {[vercmp ${xcodeversion} 10.2] >= 0} {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
# https://github.com/Homebrew/homebrew-core/pull/39134/files
# This should be removed in the next release of GCC
patchfiles-append xcode-bug-_Atomic-fix.patch
patchfiles-append xcode-bug-_Atomic-fix.patch
}

set major [lindex [split ${version} .-] 0]
Expand Down
44 changes: 22 additions & 22 deletions lang/gcc8/Portfile
Expand Up @@ -50,7 +50,7 @@ depends_lib port:cctools \
port:libmpc \
port:mpfr \
port:zlib
depends_run port:gcc_select
depends_run port:gcc_select
if { ${isLastSupported} } {
depends_run-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
} else {
Expand All @@ -72,7 +72,7 @@ if {[vercmp ${xcodeversion} 10.2] >= 0} {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
# https://github.com/Homebrew/homebrew-core/pull/39134/files
# This should be removed in the next release of GCC
patchfiles-append xcode-bug-_Atomic-fix.patch
patchfiles-append xcode-bug-_Atomic-fix.patch
}

configure.dir ${workpath}/build
Expand Down Expand Up @@ -197,10 +197,10 @@ if {${subport} eq "libgcc8"} {

# Are we providing the full main runtime ?
if { ${isLastSupported} } {

# Always provides primary runtime so always in conflict
conflicts libgcc-devel

# http://trac.macports.org/ticket/35770
# http://trac.macports.org/ticket/38814
# While there can be multiple versions of these runtimes in a single
Expand All @@ -212,25 +212,25 @@ if {${subport} eq "libgcc8"} {
# version of gcc, then the latest version of gcc to provide a given ABI
# version should continue to provide a subport for that and older gcc
# versions.

depends_run
depends_lib-delete port:zlib
depends_build-append {*}${depends_lib}
depends_lib port:zlib

configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc

# see https://trac.macports.org/ticket/54766
configure.args-replace \
--includedir=${prefix}/include/${name} \
--includedir=${prefix}/include/gcc

configure.args-replace \
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gxx-include-dir=${prefix}/include/gcc/c++/

# TODO: Possibly disable bootstrap with appropriate configure flags.
# the problem is that libstdc++'s configure script tests for tls support
# using the running compiler (not gcc for which libstdc++ is being built).
Expand All @@ -239,19 +239,19 @@ if {${subport} eq "libgcc8"} {
#compiler.blacklist-append {clang < 425}
#configure.args-append --disable-bootstrap
#build.target all

post-destroot {

file mkdir ${destroot}${prefix}/lib/libgcc.merged

foreach dylib ${dylibs} {
# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
# https://trac.macports.org/ticket/40098
# https://trac.macports.org/ticket/40100
if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
continue
}

move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
if {[variant_isset universal]} {
foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
Expand All @@ -265,39 +265,39 @@ if {${subport} eq "libgcc8"} {
}
}
}

# strip debug symbols to supress debugger warnings:
# http://trac.macports.org/attachment/ticket/34831
if {! [string match *libgcc_ext* ${dylib}]} {
system "strip -x ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
}
}

file delete -force ${destroot}${prefix}/bin
file delete -force ${destroot}${prefix}/share
file delete -force ${destroot}${prefix}/lib/libgcc
file delete -force ${destroot}${prefix}/libexec

move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc

# For binary compatibility with binaries that linked against the old libstdcxx port
ln -s libgcc/libstdc++.6.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib
}

} else {

# gcc8 runtime versions are identical to that in gcc9, so libgcc8 does not
# need to provide anything, hence do not build anything.
# port still defined as needed to satisfy dependency tree

depends_run path:lib/libgcc/libgcc_s.1.dylib:libgcc
depends_lib

fetch.type none
build { }
use_configure no
patchfiles

destroot {
set doc_dir ${destroot}${prefix}/share/doc/${subport}
xinstall -m 755 -d ${doc_dir}
Expand Down
6 changes: 3 additions & 3 deletions lang/gcc9/Portfile
Expand Up @@ -178,7 +178,7 @@ if { ${os.major} < 11 } {
# gcc cannot build if libunwind-headers is active
conflicts_build-append libunwind-headers

# List of dylibs to be installed
# List of dylibs to be installed
# Note that we really don't want to include libgcc_ext.10.[45].dylib here, but install_name_tool
# doesn't know how to change the id of stubs, and it's easier than recreating them for each
# gcc port.
Expand Down Expand Up @@ -250,7 +250,7 @@ if {${subport} eq "libgcc9"} {
#build.target all

post-destroot {

file mkdir ${destroot}${prefix}/lib/libgcc.merged

foreach dylib ${dylibs} {
Expand Down Expand Up @@ -294,7 +294,7 @@ if {${subport} eq "libgcc9"} {
}

} else {

post-destroot {

file delete ${destroot}${prefix}/share/info/dir
Expand Down

0 comments on commit 6428e9a

Please sign in to comment.