<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121413] trunk/dports/cross/arm-elf-gcc/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121413">121413</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-24 16:26:21 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>arm-elf-gcc: whitespace, sha256</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportscrossarmelfgccPortfile">trunk/dports/cross/arm-elf-gcc/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportscrossarmelfgccPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/cross/arm-elf-gcc/Portfile (121412 => 121413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-24 23:12:38 UTC (rev 121412)
+++ trunk/dports/cross/arm-elf-gcc/Portfile 2014-06-24 23:26:21 UTC (rev 121413)
</span><span class="lines">@@ -1,67 +1,66 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
</del><ins>+PortSystem 1.0
</ins><span class="cx">
</span><del>-name arm-elf-gcc
-version 4.7.3
-set branch [join [lrange [split ${version} .] 0 1] .]
</del><ins>+name arm-elf-gcc
+version 4.7.3
+set branch [join [lrange [split ${version} .] 0 1] .]
</ins><span class="cx"> conflicts arm-elf-gcc3
</span><span class="cx">
</span><span class="cx"> # Parameters for this port.
</span><del>-set newlibversion 1.20.0
</del><ins>+set newlibversion 1.20.0
</ins><span class="cx"> set crossgcc-target arm-elf
</span><span class="cx"> set default-languages --enable-languages="c,c++,objc"
</span><span class="cx">
</span><del>-description gcc cross-compilers for arm-elf, with newlib runtime library.
-long_description gnu compilers collection (including c++ and objc) for \
- arm-elf, with newlib runtime library.
-homepage http://gcc.gnu.org/
-platforms darwin
-categories cross devel
-maintainers nomaintainer
</del><ins>+description gcc cross-compilers for arm-elf, with newlib runtime library.
+long_description gnu compilers collection (including c++ and objc) for \
+ arm-elf, with newlib runtime library.
+homepage http://gcc.gnu.org/
+platforms darwin
+categories cross devel
+maintainers nomaintainer
</ins><span class="cx"> # an exception in the license allows dependents to not be GPL
</span><span class="cx"> license {GPL-3+ Permissive}
</span><del>-master_sites gnu:gcc/gcc-${version}/:gcc \
- ftp://sources.redhat.com/pub/newlib/:newlib \
- http://www.mirrorservice.org/sites/sourceware.org/pub/newlib/:newlib
-distfiles gcc-${version}.tar.bz2:gcc newlib-${newlibversion}.tar.gz:newlib
-worksrcdir gcc-${version}
</del><ins>+master_sites gnu:gcc/gcc-${version}/:gcc \
+ ftp://sources.redhat.com/pub/newlib/:newlib \
+ http://www.mirrorservice.org/sites/sourceware.org/pub/newlib/:newlib
+distfiles gcc-${version}.tar.bz2:gcc newlib-${newlibversion}.tar.gz:newlib
+worksrcdir gcc-${version}
</ins><span class="cx">
</span><span class="cx"> checksums gcc-${version}.tar.bz2 \
</span><del>- md5 86f428a30379bdee0224e353ee2f999e \
</del><span class="cx"> rmd160 b4ba153b098cad726ecd28195ee445aa542d37ae \
</span><span class="cx"> sha256 2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 \
</span><span class="cx"> newlib-${newlibversion}.tar.gz \
</span><del>- sha1 65e7bdbeda0cbbf99c8160df573fd04d1cbe00d1 \
- rmd160 e36c5337a74633456b47d09594974c7dd7a9cc3e
</del><ins>+ rmd160 e36c5337a74633456b47d09594974c7dd7a9cc3e \
+ sha256 c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692
</ins><span class="cx">
</span><del>-patchfiles patch-gcc-config-arm-t-arm-elf.diff
</del><ins>+patchfiles patch-gcc-config-arm-t-arm-elf.diff
</ins><span class="cx">
</span><span class="cx"> # All cross ports violate the mtree layout.
</span><del>-destroot.violate_mtree yes
</del><ins>+destroot.violate_mtree yes
</ins><span class="cx">
</span><span class="cx"> # Download everything to gcc/
</span><del>-dist_subdir gcc
</del><ins>+dist_subdir gcc
</ins><span class="cx">
</span><del>-depends_lib port:${crossgcc-target}-binutils \
</del><ins>+depends_lib port:${crossgcc-target}-binutils \
</ins><span class="cx"> port:gmp \
</span><span class="cx"> port:mpfr \
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:libmpc
</span><span class="cx">
</span><span class="cx"> # arm-elf-binutils is not universal
</span><del>-universal_variant no
</del><ins>+universal_variant no
</ins><span class="cx">
</span><span class="cx"> # gcc is .bz2, newlib is .gz.
</span><span class="cx"> # let's extract only gcc with MacPorts infrastructure, we'll do newlib manually.
</span><del>-use_bzip2 yes
-extract.only gcc-${version}.tar.bz2
</del><ins>+use_bzip2 yes
+extract.only gcc-${version}.tar.bz2
</ins><span class="cx">
</span><span class="cx"> # Extract newlib and create a symlink of newlib/newlib in gcc directory.
</span><del>-post-extract {
- system "cd ${workpath} && gzip -dc ${distpath}/newlib-${newlibversion}.tar.gz | tar -xf -"
- system "ln -s ${workpath}/newlib-${newlibversion}/newlib ${workpath}/gcc-${version}/"
</del><ins>+post-extract {
+ system "cd ${workpath} && gzip -dc ${distpath}/newlib-${newlibversion}.tar.gz | tar -xf -"
+ system "ln -s ${workpath}/newlib-${newlibversion}/newlib ${workpath}/gcc-${version}/"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
</span><span class="lines">@@ -71,81 +70,81 @@
</span><span class="cx"> # So let's tell gcc's Makefile not to do that mistake.
</span><span class="cx">
</span><span class="cx"> set environment [list AR_FOR_TARGET=${crossgcc-target}-ar \
</span><del>- AS_FOR_TARGET=${crossgcc-target}-as \
- LD_FOR_TARGET=${crossgcc-target}-ld \
- NM_FOR_TARGET=${crossgcc-target}-nm \
- RANLIB_FOR_TARGET=${crossgcc-target}-ranlib]
</del><ins>+ AS_FOR_TARGET=${crossgcc-target}-as \
+ LD_FOR_TARGET=${crossgcc-target}-ld \
+ NM_FOR_TARGET=${crossgcc-target}-nm \
+ RANLIB_FOR_TARGET=${crossgcc-target}-ranlib]
</ins><span class="cx">
</span><span class="cx"> proc multilibpatch_enable { options dirnames exceptions matches } {
</span><del>- global worksrcpath
- system "echo 'MULTILIB_OPTIONS += ${options}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
- system "echo 'MULTILIB_DIRNAMES += ${dirnames}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
- system "echo 'MULTILIB_EXCEPTIONS += ${exceptions}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
- system "echo 'MULTILIB_MATCHES += ${matches}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
</del><ins>+ global worksrcpath
+ system "echo 'MULTILIB_OPTIONS += ${options}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
+ system "echo 'MULTILIB_DIRNAMES += ${dirnames}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
+ system "echo 'MULTILIB_EXCEPTIONS += ${exceptions}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
+ system "echo 'MULTILIB_MATCHES += ${matches}' >> ${worksrcpath}/gcc/config/arm/t-arm-elf"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant be description {big endian multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "mlittle-endian/mbig-endian" \
- "le be" \
- "" \
- "mbig-endian=mbe mlittle-endian=mle"
- }
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "mlittle-endian/mbig-endian" \
+ "le be" \
+ "" \
+ "mbig-endian=mbe mlittle-endian=mle"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant ep9312 description {ep9312 multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "mcpu=ep9312" \
- "ep9312" \
- "*mthumb/*mcpu=ep9312* *mcpu=ep9312*/*mhard-float*" \
- ""
- }
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "mcpu=ep9312" \
+ "ep9312" \
+ "*mthumb/*mcpu=ep9312* *mcpu=ep9312*/*mhard-float*" \
+ ""
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant fpu description {fpu multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "mhard-float/msoft-float" \
- "fpu soft" \
- "*mthumb/*mhard-float*" \
- ""
- }
- configure.args-append --enable-fpu
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "mhard-float/msoft-float" \
+ "fpu soft" \
+ "*mthumb/*mhard-float*" \
+ ""
+ }
+ configure.args-append --enable-fpu
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant interwork description {thumb interwork multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "mno-thumb-interwork/mthumb-interwork" \
- "normal interwork" \
- "" \
- ""
- }
- configure.args-append --enable-interwork
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "mno-thumb-interwork/mthumb-interwork" \
+ "normal interwork" \
+ "" \
+ ""
+ }
+ configure.args-append --enable-interwork
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant under description {leading underscore multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "fno-leading-underscore/fleading-underscore" \
- "elf under" \
- "" \
- ""
- }
- configure.args-append --enable-underscore
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "fno-leading-underscore/fleading-underscore" \
+ "elf under" \
+ "" \
+ ""
+ }
+ configure.args-append --enable-underscore
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant nofmult description {no fpu multiplication multilib support} {
</span><del>- post-patch {
- multilibpatch_enable \
- "mcpu=arm7" \
- "nofmult" \
- "*mthumb*/*mcpu=arm7*" \
- ""
- }
- configure.args-append --enable-nofmult
</del><ins>+ post-patch {
+ multilibpatch_enable \
+ "mcpu=arm7" \
+ "nofmult" \
+ "*mthumb*/*mcpu=arm7*" \
+ ""
+ }
+ configure.args-append --enable-nofmult
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Fails to build with llvm-gcc, at least in Xcode 4.1; use clang (#29551)
</span><span class="lines">@@ -153,26 +152,26 @@
</span><span class="cx">
</span><span class="cx"> # Build in a different directory, as advised in the README file.
</span><span class="cx"> pre-configure {
</span><del>- file mkdir "${workpath}/build"
</del><ins>+ file mkdir "${workpath}/build"
</ins><span class="cx"> }
</span><span class="cx"> configure.dir ${workpath}/build
</span><span class="cx"> configure.cmd ${workpath}/gcc-${version}/configure
</span><span class="cx"> configure.cc-append -I${prefix}/include
</span><del>-configure.env ${environment}
</del><ins>+configure.env ${environment}
</ins><span class="cx"> configure.args --infodir='${prefix}/share/info' \
</span><del>- --mandir='${prefix}/share/man' \
- --target=${crossgcc-target} \
- --program-prefix=${crossgcc-target}- \
- --program-suffix=-${branch} \
- --without-included-gettext \
- --enable-obsolete \
- --with-newlib \
- --disable-__cxa_atexit \
- --enable-multilib \
- --enable-biendian \
- --disable-libgfortran \
- --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
- ${default-languages}
</del><ins>+ --mandir='${prefix}/share/man' \
+ --target=${crossgcc-target} \
+ --program-prefix=${crossgcc-target}- \
+ --program-suffix=-${branch} \
+ --without-included-gettext \
+ --enable-obsolete \
+ --with-newlib \
+ --disable-__cxa_atexit \
+ --enable-multilib \
+ --enable-biendian \
+ --disable-libgfortran \
+ --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
+ ${default-languages}
</ins><span class="cx"> configure.cc_archflags
</span><span class="cx"> configure.cxx_archflags
</span><span class="cx"> configure.objc_archflags
</span><span class="lines">@@ -186,167 +185,167 @@
</span><span class="cx">
</span><span class="cx"> build.dir ${workpath}/build
</span><span class="cx">
</span><del>-build.args ${environment}
-destroot.args ${environment}
</del><ins>+build.args ${environment}
+destroot.args ${environment}
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- namespace eval crossgcc {}
</del><ins>+ namespace eval crossgcc {}
</ins><span class="cx">
</span><del>- # Fix the info pages and related stuff.
- #
- # path: path to the doc directory (e.g. gas/doc/)
- # makefile: path to Makefile.in (e.g. gas/doc/Makefile.in)
- # name: name of the info page (e.g. as)
- # suffix: suffix of the souce page (texinfo or texi)
- proc crossgcc::fixinfo { path makefile name suffix } {
- global crossgcc-target worksrcpath
</del><ins>+ # Fix the info pages and related stuff.
+ #
+ # path: path to the doc directory (e.g. gas/doc/)
+ # makefile: path to Makefile.in (e.g. gas/doc/Makefile.in)
+ # name: name of the info page (e.g. as)
+ # suffix: suffix of the souce page (texinfo or texi)
+ proc crossgcc::fixinfo { path makefile name suffix } {
+ global crossgcc-target worksrcpath
</ins><span class="cx">
</span><del>- # Fix the source
- reinplace "s|setfilename ${name}.info|setfilename ${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
- reinplace "s|(${name})|(${crossgcc-target}-${name})|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
- reinplace "s|@file{${name}}|@file{${crossgcc-target}-${name}}|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
-
- # Fix the Makefile
- reinplace "s| ${name}.info| ${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.info|/${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.info|${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s| ${name}.pod| ${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.pod|/${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.pod|${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s| ${name}.${suffix}| ${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.${suffix}|/${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.${suffix}|${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
-
- # Rename the source
- file rename ${worksrcpath}/${path}/${name}.${suffix} \
- ${worksrcpath}/${path}/${crossgcc-target}-${name}.${suffix}
-
- # Fix install-info's dir.
- # (note: this may be effectless if there was no info dir to be fixed)
- reinplace "s|--info-dir=\$(DESTDIR)\$(infodir)|--dir-file=\$(DESTDIR)\$(infodir)/${crossgcc-target}-gcc-dir|g" \
- "${worksrcpath}/${makefile}"
- }
</del><ins>+ # Fix the source
+ reinplace "s|setfilename ${name}.info|setfilename ${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
+ reinplace "s|(${name})|(${crossgcc-target}-${name})|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
+ reinplace "s|@file{${name}}|@file{${crossgcc-target}-${name}}|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
</ins><span class="cx">
</span><del>- # Fix the gettext files and related stuff.
- #
- # module: name of the module (e.g. gas)
- proc crossgcc::fixgettext { module } {
- global crossgcc-target worksrcpath
</del><ins>+ # Fix the Makefile
+ reinplace "s| ${name}.info| ${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.info|/${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.info|${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s| ${name}.pod| ${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.pod|/${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.pod|${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s| ${name}.${suffix}| ${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.${suffix}|/${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.${suffix}|${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
</ins><span class="cx">
</span><del>- if { [ file exists "${worksrcpath}/${module}/Makefile.in" ] } {
- reinplace "s|@PACKAGE@|${crossgcc-target}-@PACKAGE@|g" \
- "${worksrcpath}/${module}/Makefile.in"
- reinplace "s|${module}\.mo|${crossgcc-target}-${module}.mo|g" \
- "${worksrcpath}/${module}/Makefile.in"
- }
- if { [ file exists "${worksrcpath}/${module}/doc/Makefile.in" ] } {
- reinplace "s|@PACKAGE@|${crossgcc-target}-@PACKAGE@|g" \
- "${worksrcpath}/${module}/doc/Makefile.in"
- }
- }
</del><ins>+ # Rename the source
+ file rename ${worksrcpath}/${path}/${name}.${suffix} \
+ ${worksrcpath}/${path}/${crossgcc-target}-${name}.${suffix}
</ins><span class="cx">
</span><del>- # gcc/doc/cpp.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cpp texi
</del><ins>+ # Fix install-info's dir.
+ # (note: this may be effectless if there was no info dir to be fixed)
+ reinplace "s|--info-dir=\$(DESTDIR)\$(infodir)|--dir-file=\$(DESTDIR)\$(infodir)/${crossgcc-target}-gcc-dir|g" \
+ "${worksrcpath}/${makefile}"
+ }
</ins><span class="cx">
</span><del>- # gcc/doc/cppinternals.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cppinternals texi
</del><ins>+ # Fix the gettext files and related stuff.
+ #
+ # module: name of the module (e.g. gas)
+ proc crossgcc::fixgettext { module } {
+ global crossgcc-target worksrcpath
</ins><span class="cx">
</span><del>- # gcc/doc/gcc.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gcc texi
</del><ins>+ if { [ file exists "${worksrcpath}/${module}/Makefile.in" ] } {
+ reinplace "s|@PACKAGE@|${crossgcc-target}-@PACKAGE@|g" \
+ "${worksrcpath}/${module}/Makefile.in"
+ reinplace "s|${module}\.mo|${crossgcc-target}-${module}.mo|g" \
+ "${worksrcpath}/${module}/Makefile.in"
+ }
+ if { [ file exists "${worksrcpath}/${module}/doc/Makefile.in" ] } {
+ reinplace "s|@PACKAGE@|${crossgcc-target}-@PACKAGE@|g" \
+ "${worksrcpath}/${module}/doc/Makefile.in"
+ }
+ }
</ins><span class="cx">
</span><del>- # gcc/doc/gccint.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccint texi
</del><ins>+ # gcc/doc/cpp.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cpp texi
</ins><span class="cx">
</span><del>- # gcc/fortran/gfortran.texi
- crossgcc::fixinfo gcc/fortran/ gcc/fortran/Make-lang.in gfortran texi
</del><ins>+ # gcc/doc/cppinternals.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cppinternals texi
</ins><span class="cx">
</span><del>- # gcc/java/gcj.texi
- crossgcc::fixinfo gcc/java/ gcc/java/Make-lang.in gcj texi
</del><ins>+ # gcc/doc/gcc.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gcc texi
</ins><span class="cx">
</span><del>- # gcc/doc/gccinstall.info
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccinstall info
</del><ins>+ # gcc/doc/gccint.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccint texi
</ins><span class="cx">
</span><del>- # gettext stuff.
- crossgcc::fixgettext gcc
- crossgcc::fixgettext libcpp
</del><ins>+ # gcc/fortran/gfortran.texi
+ crossgcc::fixinfo gcc/fortran/ gcc/fortran/Make-lang.in gfortran texi
+
+ # gcc/java/gcj.texi
+ crossgcc::fixinfo gcc/java/ gcc/java/Make-lang.in gcj texi
+
+ # gcc/doc/gccinstall.info
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccinstall info
+
+ # gettext stuff.
+ crossgcc::fixgettext gcc
+ crossgcc::fixgettext libcpp
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><del>- # gcc needs the cross directory structure to be present
- # in order to fill it during installation.
- file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
</del><ins>+ # gcc needs the cross directory structure to be present
+ # in order to fill it during installation.
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- namespace eval crossgcc {}
</del><ins>+ namespace eval crossgcc {}
</ins><span class="cx">
</span><del>- # Rename a man page if it exists.
- #
- # section: section of the man page (e.g. 1)
- # manpage: name of the man page (e.g. cpp)
- proc crossgcc::rename_man_page { section manpage } {
- global crossgcc-target destroot prefix
</del><ins>+ # Rename a man page if it exists.
+ #
+ # section: section of the man page (e.g. 1)
+ # manpage: name of the man page (e.g. cpp)
+ proc crossgcc::rename_man_page { section manpage } {
+ global crossgcc-target destroot prefix
</ins><span class="cx">
</span><del>- set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
- if { [ file exists ${manpage_path} ] } {
- file rename ${manpage_path} \
- "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
- }
- }
</del><ins>+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
+ if { [ file exists ${manpage_path} ] } {
+ file rename ${manpage_path} \
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ }
+ }
</ins><span class="cx">
</span><del>- # Stuff I don't want (either because they're in the system
- # or because they would conflict with other FSF ports)
- # (it's easier for maintainability purposes to fix things here)
</del><ins>+ # Stuff I don't want (either because they're in the system
+ # or because they would conflict with other FSF ports)
+ # (it's easier for maintainability purposes to fix things here)
</ins><span class="cx">
</span><del>- # aliases for locales (should be on the system)
- file delete "${destroot}${prefix}/share/locale/locale.alias"
-
- # FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}${prefix}/share/man/man7"
</del><ins>+ # aliases for locales (should be on the system)
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
</ins><span class="cx">
</span><del>- # (host) libiberty
- foreach f [glob -directory "${destroot}${prefix}/lib" libiberty.a */libiberty.a] {
</del><ins>+ # FSF propaganda (should already be there or would conflict)
+ file delete -force "${destroot}${prefix}/share/man/man7"
+
+ # (host) libiberty
+ foreach f [glob -directory "${destroot}${prefix}/lib" libiberty.a */libiberty.a] {
</ins><span class="cx"> file delete $f
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # aliases for charsets (should already be there)
- file delete "${destroot}${prefix}/lib/charset.alias"
-
- # Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}${prefix}/share/man/man1/gij.1"
-
- # For some reason, some man pages are not prefixed while they should have been
- # (to avoid conflicting).
- crossgcc::rename_man_page 1 cpp
- crossgcc::rename_man_page 1 gcjh
- crossgcc::rename_man_page 1 gcov
- crossgcc::rename_man_page 1 jcf-dump
- crossgcc::rename_man_page 1 jv-scan
-
- # There is a bug in gcc/Makefile::install-driver
- # For cross compilers, $(GCC_INSTALL_NAME) is equal to
- # $(target_noncanonical)-gcc-$(version)
- # and hence the driver isn't installed.
- xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
</del><ins>+ # aliases for charsets (should already be there)
+ file delete "${destroot}${prefix}/lib/charset.alias"
+
+ # Remove man pages for tools that are not built as part of cross-gcc
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
+
+ # For some reason, some man pages are not prefixed while they should have been
+ # (to avoid conflicting).
+ crossgcc::rename_man_page 1 cpp
+ crossgcc::rename_man_page 1 gcjh
+ crossgcc::rename_man_page 1 gcov
+ crossgcc::rename_man_page 1 jcf-dump
+ crossgcc::rename_man_page 1 jv-scan
+
+ # There is a bug in gcc/Makefile::install-driver
+ # For cross compilers, $(GCC_INSTALL_NAME) is equal to
+ # $(target_noncanonical)-gcc-$(version)
+ # and hence the driver isn't installed.
+ xinstall -c "${workpath}/build/gcc/xgcc" \
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url http://gcc.gnu.org/releases.html
-livecheck.regex {<tr><td><a href="gcc-.*/">GCC (.*)</a></td> <td>.*</td></tr>}
</del><ins>+livecheck.type regex
+livecheck.url http://gcc.gnu.org/releases.html
+livecheck.regex {<tr><td><a href="gcc-.*/">GCC (.*)</a></td> <td>.*</td></tr>}
</ins></span></pre>
</div>
</div>
</body>
</html>