Changeset f8a51225

Timestamp:

08/23/2022 07:40:37 PM (10 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

d8c9a43f

Parents:

192dda3 (diff), fd4792b (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 'multilib' of git.linuxfromscratch.org:lfs into multilib

Files:

• chapter07/util-linux.xml (modified) (4 diffs)
• chapter08/attr.xml (modified) (2 diffs)
• chapter08/eudev.xml (modified) (2 diffs)
• chapter08/expat.xml (modified) (2 diffs)
• chapter08/kmod.xml (modified) (2 diffs)
• chapter08/readline.xml (modified) (2 diffs)
• chapter08/stripping.xml (modified) (2 diffs)
• chapter08/wheel.xml (modified) (1 diff)

chapter07/util-linux.xml

@@ -142 +142 @@
 <screen><userinput remap="configure">CC="gcc -m32" \
 ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/lib32      \
+            --host=i686-pc-linux-gnu \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
@@ -152 +154 @@
             --disable-static     \
             --without-python     \
-            --libdir=/usr/lib32      \
-            --host=i686-pc-linux-gnu</userinput></screen>
+            runstatedir=/run</userinput></screen>
 
     <para>Compile the package:</para>
@@ -182 +183 @@
 <screen><userinput remap="configure">CC="gcc -mx32" \
 ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/libx32 \
+            --host=x86_64-pc-linux-gnux32 \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
@@ -192 +195 @@
             --disable-static     \
             --without-python     \
-            --libdir=/usr/libx32 \
-            --host=x86_64-pc-linux-gnux32</userinput></screen>
+            runstatedir=/run</userinput></screen>
 
     <para>Compile the package:</para>

chapter08/attr.xml

@@ -81 +81 @@
     --prefix=/usr         \
     --disable-static      \
-    --libdir=/usr/lib32 \
+    --sysconfdir=/etc     \
+    --libdir=/usr/lib32   \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -112 +113 @@
     --prefix=/usr          \
     --disable-static       \
+    --sysconfdir=/etc      \
     --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>

chapter08/eudev.xml

@@ -105 +105 @@
             --sysconfdir=/etc              \
             --disable-manpages             \
-            --disable-static               \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
 
     <para>Compile the package:</para>
@@ -140 +139 @@
             --sysconfdir=/etc              \
             --disable-manpages             \
-            --disable-static               \
-            --config-cache</userinput></screen>
+            --disable-static</userinput></screen>
 
     <para>Compile the package:</para>

chapter08/expat.xml

@@ -82 +82 @@
 
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
-    --prefix=/usr         \
+    --prefix=/usr        \
+    --disable-static     \
     --libdir=/usr/lib32  \
     --host=i686-pc-linux-gnu</userinput></screen>
@@ -114 +115 @@
 
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
-    --prefix=/usr         \
+    --prefix=/usr        \
+    --disable-static     \
     --libdir=/usr/libx32 \
     --host=x86_64-pc-linux-gnux32</userinput></screen>

chapter08/kmod.xml

@@ -119 +119 @@
     --libdir=/usr/lib32           \
     --sysconfdir=/etc             \
+    --with-openssl                \
     --with-xz                     \
     --with-zstd                   \
@@ -156 +157 @@
     --libdir=/usr/libx32          \
     --sysconfdir=/etc             \
+    --with-openssl                \
     --with-xz                     \
     --with-zstd                   \

chapter08/readline.xml

@@ -118 +118 @@
     --prefix=/usr                 \
     --libdir=/usr/lib32           \
-    --disable-static</userinput></screen>
+    --disable-static              \
+    --with-curses</userinput></screen>
 
     <para>Compile the package:</para>
@@ -149 +150 @@
     --prefix=/usr                 \
     --libdir=/usr/libx32          \
-    --disable-static</userinput></screen>
+    --disable-static              \
+    --with-curses</userinput></screen>
 
     <para>Compile the package:</para>

chapter08/stripping.xml

@@ -139 +139 @@
     esac
 done</userinput><userinput arch="ml_32,ml_all">
-for i in $(find /usr/lib32 -type f -name \*.so* ! -name \*dbg); do
+for i in $(find /usr/lib32 -type f -name \*.so* ! -name \*dbg) \
+         $(find /usr/lib32 -type f -name \*.a); do
     case "$online_usrbin $online_usrlib $save_usrlib" in
         *$(basename $i)* )
@@ -147 +148 @@
     esac
 done</userinput><userinput arch="ml_x32,ml_all">
-for i in $(find /usr/libx32 -type f -name \*.so* ! -name \*dbg); do
+for i in $(find /usr/libx32 -type f -name \*.so* ! -name \*dbg) \
+         $(find /usr/libx32 -type f -name \*.a); do
     case "$online_usrbin $online_usrlib $save_usrlib" in
         *$(basename $i)* )

chapter08/wheel.xml

@@ -87 +87 @@
         <seg>
            /usr/lib/python&python-minor;/site-packages/wheel and
-           /usr/lib/python&python-minor;/site-packages/wheel-0.37.1-py3.10.egg-info
+           /usr/lib/python&python-minor;/site-packages/wheel-&wheel-version;-py&python-minor;.egg-info
         </seg>
       </seglistitem>