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

Cosmetic rearrange options to appear more consistent

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2021-05-18 10:02:19 +02:00
parent 32f47b1fb5
commit 70aadfbaf4
9 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chapter08/gmp.xml
View File

@ -143,11 +143,12 @@ cp -v configfsf.sub config.sub</userinput></screen>
CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \ CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
CXXFLAGS="$CFLAGS" \ CXXFLAGS="$CFLAGS" \
PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \ PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
./configure \ ./configure \
--prefix=/usr \ --host=i686-pc-linux-gnu \
--disable-static \ --prefix=/usr \
--enable-cxx \ --disable-static \
--libdir=/usr/lib32 \ --enable-cxx \
--libdir=/usr/lib32 \
--includedir=/usr/include/m32/gmp</userinput></screen> --includedir=/usr/include/m32/gmp</userinput></screen>
<variablelist> <variablelist>
@ -215,11 +216,12 @@ cp -v configfsf.sub config.sub</userinput></screen>
CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \ CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \
CXXFLAGS="$CFLAGS" \ CXXFLAGS="$CFLAGS" \
PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \ PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
./configure \ ./configure \
--prefix=/usr \ --host=x86_64-pc-linux-gnux32 \
--disable-static \ --prefix=/usr \
--enable-cxx \ --disable-static \
--libdir=/usr/libx32 \ --enable-cxx \
--libdir=/usr/libx32 \
--includedir=/usr/include/mx32/gmp</userinput></screen> --includedir=/usr/include/mx32/gmp</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

8
chapter08/kmod.xml
View File

@ -99,13 +99,12 @@ make clean</userinput></screen>
<para>Prepare Kmod for compilation:</para> <para>Prepare Kmod for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32" ./configure \ <screen><userinput remap="configure">CC="gcc -m32" ./configure \
--host=i686-pc-linux-gnu \
--prefix=/usr \ --prefix=/usr \
--bindir=/bin \ --libdir=/usr/lib32 \
--libdir=/usr/lib32 \
--sysconfdir=/etc \ --sysconfdir=/etc \
--with-xz \ --with-xz \
--with-zlib \ --with-zlib \
--host=i686-pc-linux-gnu \
--with-rootlibdir=/usr/lib32</userinput></screen> --with-rootlibdir=/usr/lib32</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -136,13 +135,12 @@ make clean</userinput></screen>
<para>Prepare Kmod for compilation:</para> <para>Prepare Kmod for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32" ./configure \ <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
--host=x86_64-pc-linux-gnux32 \
--prefix=/usr \ --prefix=/usr \
--bindir=/bin \
--libdir=/usr/libx32 \ --libdir=/usr/libx32 \
--sysconfdir=/etc \ --sysconfdir=/etc \
--with-xz \ --with-xz \
--with-zlib \ --with-zlib \
--host=x86_64-pc-linux-gnux32 \
--with-rootlibdir=/usr/libx32</userinput></screen> --with-rootlibdir=/usr/libx32</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

6
chapter08/libelf.xml
View File

@ -82,9 +82,9 @@ rm /usr/lib/libelf.a</userinput></screen>
<para>Prepare Libtool for compilation:</para> <para>Prepare Libtool for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32" ./configure \ <screen><userinput remap="configure">CC="gcc -m32" ./configure \
--prefix=/usr \
--libdir=/usr/lib32 \
--host=i686-pc-linux-gnu \ --host=i686-pc-linux-gnu \
--prefix=/usr \
--libdir=/usr/lib32 \
--disable-debuginfod \ --disable-debuginfod \
--enable-libdebuginfod=dummy</userinput></screen> --enable-libdebuginfod=dummy</userinput></screen>
@ -115,9 +115,9 @@ rm -rf DESTDIR</userinput></screen>
<para>Prepare Libtool for compilation:</para> <para>Prepare Libtool for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32" ./configure \ <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
--host=x86_64-pc-linux-gnux32 \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib32 \ --libdir=/usr/lib32 \
--host=x86_64-pc-linux-gnux32 \
--disable-debuginfod \ --disable-debuginfod \
--enable-libdebuginfod=dummy</userinput></screen> --enable-libdebuginfod=dummy</userinput></screen>

12
chapter08/libtool.xml
View File

@ -91,9 +91,9 @@
<para>Prepare Libtool for compilation:</para> <para>Prepare Libtool for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32" ./configure \ <screen><userinput remap="configure">CC="gcc -m32" ./configure \
--prefix=/usr \ --host=i686-pc-linux-gnu \
--libdir=/usr/lib32 \ --prefix=/usr \
--host=i686-pc-linux-gnu</userinput></screen> --libdir=/usr/lib32</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -121,9 +121,9 @@ rm -rf DESTDIR</userinput></screen>
<para>Prepare Libtool for compilation:</para> <para>Prepare Libtool for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32" ./configure \ <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
--prefix=/usr \ --host=x86_64-pc-linux-gnux32 \
--libdir=/usr/libx32 \ --prefix=/usr \
--host=x86_64-pc-linux-gnux32</userinput></screen> --libdir=/usr/libx32</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

2
chapter08/openssl.xml
View File

@ -116,7 +116,6 @@ CC="gcc -m32 -march=i686" \
CXX="g++ -m32 -march=i686" \ CXX="g++ -m32 -march=i686" \
./config \ ./config \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib32 \
--openssldir=/etc/ssl \ --openssldir=/etc/ssl \
--libdir=lib32 \ --libdir=lib32 \
shared \ shared \
@ -152,7 +151,6 @@ CC="gcc -mx32" \
CXX="g++ -mx32" \ CXX="g++ -mx32" \
./config \ ./config \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/libx32 \
--openssldir=/etc/ssl \ --openssldir=/etc/ssl \
--libdir=libx32 \ --libdir=libx32 \
shared \ shared \

16
chapter08/readline.xml
View File

@ -114,10 +114,10 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<para>Prepare Readline for compilation:</para> <para>Prepare Readline for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32" ./configure \ <screen><userinput remap="configure">CC="gcc -m32" ./configure \
--prefix=/usr \ --host=i686-pc-linux-gnu \
--libdir=/usr/lib32 \ --prefix=/usr \
--disable-static \ --libdir=/usr/lib32 \
--host=i686-pc-linux-gnu</userinput></screen> --disable-static</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -145,10 +145,10 @@ rm -rf DESTDIR</userinput></screen>
<para>Prepare Readline for compilation:</para> <para>Prepare Readline for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32" ./configure \ <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
--prefix=/usr \ --host=x86_64-pc-linux-gnux32 \
--libdir=/usr/libx32 \ --prefix=/usr \
--disable-static \ --libdir=/usr/libx32 \
--host=x86_64-pc-linux-gnux32</userinput></screen> --disable-static</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

16
chapter08/util-linux.xml
View File

@ -119,6 +119,8 @@ su tester -c "make -k check"</userinput></screen>
<screen revision="sysv"><userinput remap="configure">CC="gcc -m32" \ <screen revision="sysv"><userinput remap="configure">CC="gcc -m32" \
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--host=i686-pc-linux-gnu \
--libdir=/usr/lib32 \
--docdir=/usr/share/doc/util-linux-&util-linux-version; \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \
--disable-chfn-chsh \ --disable-chfn-chsh \
--disable-login \ --disable-login \
@ -130,13 +132,13 @@ su tester -c "make -k check"</userinput></screen>
--disable-static \ --disable-static \
--without-python \ --without-python \
--without-systemd \ --without-systemd \
--libdir=/usr/lib32 \
--host=i686-pc-linux-gnu \
--without-systemdsystemunitdir \ --without-systemdsystemunitdir \
--enable-libmount-force-mountinfo</userinput></screen> --enable-libmount-force-mountinfo</userinput></screen>
<screen revision="systemd"><userinput remap="configure">CC="gcc -m32" \ <screen revision="systemd"><userinput remap="configure">CC="gcc -m32" \
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--host=i686-pc-linux-gnu \
--libdir=/usr/lib32 \
--docdir=/usr/share/doc/util-linux-&util-linux-version; \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \
--disable-chfn-chsh \ --disable-chfn-chsh \
--disable-login \ --disable-login \
@ -147,8 +149,6 @@ su tester -c "make -k check"</userinput></screen>
--disable-pylibmount \ --disable-pylibmount \
--disable-static \ --disable-static \
--without-python \ --without-python \
--libdir=/usr/lib32 \
--host=i686-pc-linux-gnu \
--enable-libmount-force-mountinfo</userinput></screen> --enable-libmount-force-mountinfo</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -178,6 +178,8 @@ rm -rf DESTDIR</userinput></screen>
<screen revision="sysv"><userinput remap="configure">CC="gcc -mx32" \ <screen revision="sysv"><userinput remap="configure">CC="gcc -mx32" \
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--host=x86_64-pc-linux-gnux32 \
--libdir=/usr/libx32 \
--docdir=/usr/share/doc/util-linux-&util-linux-version; \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \
--disable-chfn-chsh \ --disable-chfn-chsh \
--disable-login \ --disable-login \
@ -190,12 +192,12 @@ rm -rf DESTDIR</userinput></screen>
--without-python \ --without-python \
--without-systemd \ --without-systemd \
--without-systemdsystemunitdir \ --without-systemdsystemunitdir \
--libdir=/usr/libx32 \
--host=x86_64-pc-linux-gnux32 \
--enable-libmount-force-mountinfo</userinput></screen> --enable-libmount-force-mountinfo</userinput></screen>
<screen revision="systemd"><userinput remap="configure">CC="gcc -mx32" \ <screen revision="systemd"><userinput remap="configure">CC="gcc -mx32" \
./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
--host=x86_64-pc-linux-gnux32 \
--libdir=/usr/libx32 \
--docdir=/usr/share/doc/util-linux-&util-linux-version; \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \
--disable-chfn-chsh \ --disable-chfn-chsh \
--disable-login \ --disable-login \
@ -206,8 +208,6 @@ rm -rf DESTDIR</userinput></screen>
--disable-pylibmount \ --disable-pylibmount \
--disable-static \ --disable-static \
--without-python \ --without-python \
--libdir=/usr/libx32 \
--host=x86_64-pc-linux-gnux32 \
--enable-libmount-force-mountinfo</userinput></screen> --enable-libmount-force-mountinfo</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

16
chapter08/xz.xml
View File

@ -78,10 +78,10 @@
<para>Prepare Xz for compilation:</para> <para>Prepare Xz for compilation:</para>
<screen><userinput remap="configure">CC="gcc -m32" ./configure \ <screen><userinput remap="configure">CC="gcc -m32" ./configure \
--prefix=/usr \ --host=i686-pc-linux-gnu \
--disable-static \ --prefix=/usr \
--libdir=/usr/lib32 \ --libdir=/usr/lib32 \
--host=i686-pc-linux-gnu</userinput></screen> --disable-static</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
@ -109,10 +109,10 @@ rm -rf DESTDIR</userinput></screen>
<para>Prepare Xz for compilation:</para> <para>Prepare Xz for compilation:</para>
<screen><userinput remap="configure">CC="gcc -mx32" ./configure \ <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
--prefix=/usr \ --host=x86_64-pc-linux-gnux32 \
--disable-static \ --prefix=/usr \
--libdir=/usr/libx32 \ --libdir=/usr/libx32 \
--host=x86_64-pc-linux-gnux32</userinput></screen> --disable-static</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>

4
chapter08/zstd.xml
View File

@ -76,7 +76,7 @@
<para>Install the package:</para> <para>Install the package:</para>
<screen><userinput remap="install">CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install <screen><userinput remap="install">make prefix=/usr DESTDIR=$PWD/DESTDIR install
cp -Rv DESTDIR/usr/lib/* /usr/lib32/ cp -Rv DESTDIR/usr/lib/* /usr/lib32/
sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc
rm -rf DESTDIR</userinput></screen> rm -rf DESTDIR</userinput></screen>
@ -100,7 +100,7 @@ rm -rf DESTDIR</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>
<screen><userinput remap="install">CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install <screen><userinput remap="install">make prefix=/usr DESTDIR=$PWD/DESTDIR install
cp -Rv DESTDIR/usr/lib/* /usr/libx32/ cp -Rv DESTDIR/usr/lib/* /usr/libx32/
sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc
rm -rf DESTDIR</userinput></screen> rm -rf DESTDIR</userinput></screen>