Changeset f71be678

Timestamp:

05/09/2022 04:45:27 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

8dacd5e

Parents:

5a8de59 (diff), b5844a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/prog/gcc.xml (modified) (1 diff)
• postlfs/filesystems/uefi-bootloaders/grub-efi.xml (modified) (1 diff)

general/prog/gcc.xml

@@ -7 +7 @@
   <!ENTITY gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
   <!ENTITY gcc-download-ftp   "&gnu-ftp;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
+  <!-- Update this also on the grub-uefi page -->
   <!ENTITY gcc-md5sum         "ed45b55ee859ada4b25a1e76e0c4d966">
   <!ENTITY gcc-size           "79 MB">

postlfs/filesystems/uefi-bootloaders/grub-efi.xml

@@ -167 +167 @@
 <!-- 'literal' is used deliberately to show this is only for 32-bit LFS -->
 <screen><userinput>case $(uname -m) in i?86 )
-    <literal>tar xf ../gcc-11.2.0.tar.xz
-    mkdir gcc-11.2.0/build
-    pushd gcc-11.2.0/build
+    <literal>tar xf ../gcc-&gcc-version;.tar.xz
+    mkdir gcc-&gcc-version;/build
+    pushd gcc-&gcc-version;/build
         ../configure --prefix=$PWD/../../x86_64-gcc \
                      --target=x86_64-linux-gnu      \