<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p style="color: #777777;">
<a href="https://gitlab.rtems.org/chris">Chris Johns</a>
commented on a
<a href="https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/48#note_111368">discussion</a>:
</p>
<div class="md" style="color: #333238; word-wrap: break-word;">
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">With <a href="https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/49" data-reference-type="merge_request" data-original="!49" data-link="false" data-link-reference="false" data-merge-request="365" data-project="7" data-project-path="rtems/tools/rtems-source-builder" data-iid="49" data-container="body" data-placement="top" title="Fix config file directive processing in includes" class="gfm gfm-merge_request" style="margin-top: 0;">!49</a> and the following patch I can build a tool chain for <code style='font-size: 90%; color: #1f1e24; word-wrap: break-word; background-color: #ececef; border-radius: .25rem; font-weight: inherit; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 2px 4px;'>aarch64</code> with <code style='font-size: 90%; color: #1f1e24; word-wrap: break-word; background-color: #ececef; border-radius: .25rem; font-weight: inherit; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 2px 4px;'>--no-install</code> and <code style='font-size: 90%; color: #1f1e24; word-wrap: break-word; background-color: #ececef; border-radius: .25rem; font-weight: inherit; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; white-space: pre-wrap; overflow-wrap: break-word; word-break: keep-all; padding: 2px 4px;'>--bet-tar-file</code>. The patch is:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" v-pre="true" style='display: block; font-size: 14px; color: #333238; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; white-space: pre; margin-top: 0; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="diff" style="margin-top: 0;"><span class="gh" style="margin-top: 0;">diff --git a/rtems/config/tools/rtems-install-stdcxx.cfg b/rtems/config/tools/rtems-install-stdcxx.cfg</span></span>
<span id="LC2" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index e32f1d2..3ec7f2f 100644</span></span>
<span id="LC3" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/rtems/config/tools/rtems-install-stdcxx.cfg</span></span>
<span id="LC4" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/rtems/config/tools/rtems-install-stdcxx.cfg</span></span>
<span id="LC5" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -5,12 +5,14 @@</span></span>
<span id="LC6" class="line" lang="diff"> # Path to the location of the template script.</span>
<span id="LC7" class="line" lang="diff"> %define stdcxx_template %{rtems_configdir}/stdcxx-template.py</span>
<span id="LC8" class="line" lang="diff"></span>
<span id="LC9" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-# Get the current GCC version of the target being built.</span></span>
<span id="LC10" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%define rsb_rtems_gcc_version %(%{_bindir}/%{_target}-gcc --version | head -1 | awk '{print $3}')</span></span>
<span id="LC11" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-</span></span>
<span id="LC12" class="line" lang="diff"> # Path to the target location of the script: gdb/python</span>
<span id="LC13" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%define stdcxx_script %{_prefix}/share/gdb/python/rtems/stdcxx.py</span></span>
<span id="LC14" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%define stdcxx_script_path $SB_BUILD_ROOT/%{_prefix}/share/gdb/python/rtems</span></span>
<span id="LC15" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%define stdcxx_script %{stdcxx_script_path}/stdcxx.py</span></span>
<span id="LC16" class="line" lang="diff"></span>
<span id="LC17" class="line" lang="diff"> # Modify the template script and update the current GCC version</span>
<span id="LC18" class="line" lang="diff"> # and place it in the target location.</span>
<span id="LC19" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-%(cat "%{stdcxx_template}" | sed "s/@RSB_GCC_VERSION@/%{rsb_rtems_gcc_version}/g" > "%{stdcxx_script}")</span></span>
<span id="LC20" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+%install</span></span>
<span id="LC21" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ echo "Installing RTEMS stdc++ Pretty Printer support"</span></span>
<span id="LC22" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ RSB_RTEMS_GCC_VERSION=$($SB_BUILD_ROOT_BINDIR/%{_target}-gcc --version | head -1 | awk '{print $3}')</span></span>
<span id="LC23" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ mkdir -p %{stdcxx_script_path}</span></span>
<span id="LC24" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ cat "%{stdcxx_template}" | sed "s/@RSB_GCC_VERSION@/${RSB_RTEMS_GCC_VERSION}/g" > "%{stdcxx_script}"</span></span>
<span id="LC25" class="line" lang="diff"><span class="gh" style="margin-top: 0;">diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg</span></span>
<span id="LC26" class="line" lang="diff"><span class="gh" style="margin-top: 0;">index 250930a..b317eb1 100644</span></span>
<span id="LC27" class="line" lang="diff"><span class="gd" style="margin-top: 0;">--- a/source-builder/config/gcc-common-1.cfg</span></span>
<span id="LC28" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ b/source-builder/config/gcc-common-1.cfg</span></span>
<span id="LC29" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -225,10 +225,6 @@</span> URL: http://gcc.gnu.org/</span>
<span id="LC30" class="line" lang="diff"> %{__make} DESTDIR=$SB_BUILD_ROOT install</span>
<span id="LC31" class="line" lang="diff"> cd ${build_top}</span>
<span id="LC32" class="line" lang="diff"></span>
<span id="LC33" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- %if %{defined gcc_pre_install}</span></span>
<span id="LC34" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- %{gcc_pre_install}</span></span>
<span id="LC35" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- %endif</span></span>
<span id="LC36" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- </span></span>
<span id="LC37" class="line" lang="diff"> # libiberty doesn't honor --libdir, but always installs to a</span>
<span id="LC38" class="line" lang="diff"> # magically guessed _libdir</span>
<span id="LC39" class="line" lang="diff"> %{__rmfile} ${SB_BUILD_ROOT}%{_libdir}/libiberty.a</span>
<span id="LC40" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -242,6 +238,10 @@</span> URL: http://gcc.gnu.org/</span>
<span id="LC41" class="line" lang="diff"> # Don't want libffi's man-pages</span>
<span id="LC42" class="line" lang="diff"> %{__rmfile} $SB_BUILD_ROOT%{_mandir}/man3/*ffi*</span>
<span id="LC43" class="line" lang="diff"></span>
<span id="LC44" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ %if %{defined gcc_pre_install}</span></span>
<span id="LC45" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ %{gcc_pre_install}</span></span>
<span id="LC46" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+ %endif</span></span>
<span id="LC47" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+</span></span>
<span id="LC48" class="line" lang="diff"> # Clean the symlinks away incase the source is a repo</span>
<span id="LC49" class="line" lang="diff"> # Note, delete as a directory because of MSYS2 support on Windows.</span>
<span id="LC50" class="line" lang="diff"> %{__rmdir} ${source_dir_gcc}/newlib</span></code></pre>
<copy-code></copy-code>
</div>
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">The command is:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre class="code highlight js-syntax-highlight language-plaintext" v-pre="true" style='display: block; font-size: 14px; color: #333238; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; white-space: pre; margin-top: 0; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="plaintext" style="margin-top: 0;">../source-builder/sb-set-builder --prefix=/bad/bad --no-install --bset-tar-file --log=ni-aa.txt --trace --no-clean 6/rtems-aarch64</span></code></pre>
<copy-code></copy-code>
</div>
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">Checking the tar file shows the install Python file:</p>
<div class="gl-relative markdown-code-block js-markdown-code" style="margin-bottom: 0;">
<pre class="code highlight js-syntax-highlight language-plaintext" v-pre="true" style='display: block; font-size: 14px; color: #333238; line-height: 1.6em; overflow-x: auto; border-radius: .25rem; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: inherit; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: .25rem; white-space: pre; margin-top: 0; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; vertical-align: bottom; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="plaintext" style="margin-top: 0;"> $ tar ztvf tar/rtems-aarch64.tar.bz2 | grep stdcxx.py</span>
<span id="LC2" class="line" lang="plaintext">-rw-r--r-- 0 chris chris 1420 Aug 21 16:08 bad/bad/share/gdb/python/rtems/stdcxx.py</span></code></pre>
<copy-code></copy-code>
</div>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/48#note_111368">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.rtems.org">gitlab.rtems.org</a>. <a href="https://gitlab.rtems.org/-/sent_notifications/b939c3cd261064f060123522250cc60b/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.rtems.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.rtems.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Merge request","url":"https://gitlab.rtems.org/rtems/tools/rtems-source-builder/-/merge_requests/48#note_111368"}}</script>
</p>
</div>
</body>
</html>