gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 11:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop the min-kernel alignment hack

Browse Source 
Someone is really insistant on "you cannot have any extra whitespace" so
the hack will just not work.  Let's drop it and simply move the
--enable-kernel= switches to the last line.
This commit is contained in:
Xi Ruoyao 2025-05-23 12:23:43 +08:00
parent fd69440977
commit a45bbbc391
No known key found for this signature in database
GPG Key ID: ACAAD20E19E710E3
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chapter05/glibc.xml
View File

@ -90,9 +90,9 @@ cd build</userinput></screen>
--prefix=/usr \ --prefix=/usr \
--host=$LFS_TGT \ --host=$LFS_TGT \
--build=$(../scripts/config.guess) \ --build=$(../scripts/config.guess) \
--enable-kernel=&min-kernel; \
--disable-nscd \ --disable-nscd \
libc_cv_slibdir=/usr/lib</userinput></screen> libc_cv_slibdir=/usr/lib \
--enable-kernel=&min-kernel;</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the configure options:</title> <title>The meaning of the configure options:</title>

12
chapter08/glibc.xml
View File

@ -68,12 +68,12 @@ cd build</userinput></screen>
<para>Prepare Glibc for compilation:</para> <para>Prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../configure --prefix=/usr \ <screen><userinput remap="configure">../configure --prefix=/usr \
--disable-werror \ --disable-werror \
--disable-nscd \ --disable-nscd \
--enable-kernel=&min-kernel;\ libc_cv_slibdir=/usr/lib \
libc_cv_slibdir=/usr/lib \ --enable-stack-protector=strong \
--enable-stack-protector=strong</userinput></screen> --enable-kernel=&min-kernel;</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the configure options:</title> <title>The meaning of the configure options:</title>

6
general.ent
View File

@ -96,10 +96,8 @@
<!ENTITY secadv "&lfs-root;lfs/advisories/"> <!ENTITY secadv "&lfs-root;lfs/advisories/">
<!-- 5.4 EOL is Dec 2025 <!-- 5.4 EOL is Dec 2025
so for LFS 12.5 we may consider moving to 5.10. so for LFS 12.5 we may consider moving to 5.10. -->
Keep an extra whitespace here to align the trailing "\" in glibc <!ENTITY min-kernel "5.4">
configure command if y < 10 in x.y. -->
<!ENTITY min-kernel "5.4 ">
<!-- <!--
<!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/"> <!ENTITY patches-rootd "&lfs-root;patches/lfs/&generic-versiond;/">