diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml index 635938c85..94f842918 100644 --- a/chapter08/gmp.xml +++ b/chapter08/gmp.xml @@ -143,11 +143,12 @@ cp -v configfsf.sub config.sub CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \ CXXFLAGS="$CFLAGS" \ PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \ -./configure \ - --prefix=/usr \ - --disable-static \ - --enable-cxx \ - --libdir=/usr/lib32 \ +./configure \ + --host=i686-pc-linux-gnu \ + --prefix=/usr \ + --disable-static \ + --enable-cxx \ + --libdir=/usr/lib32 \ --includedir=/usr/include/m32/gmp @@ -215,11 +216,12 @@ cp -v configfsf.sub config.sub CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \ CXXFLAGS="$CFLAGS" \ PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \ -./configure \ - --prefix=/usr \ - --disable-static \ - --enable-cxx \ - --libdir=/usr/libx32 \ +./configure \ + --host=x86_64-pc-linux-gnux32 \ + --prefix=/usr \ + --disable-static \ + --enable-cxx \ + --libdir=/usr/libx32 \ --includedir=/usr/include/mx32/gmp Compile the package: diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index e01699bbc..7801080cf 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -99,13 +99,12 @@ make clean Prepare Kmod for compilation: CC="gcc -m32" ./configure \ + --host=i686-pc-linux-gnu \ --prefix=/usr \ - --bindir=/bin \ - --libdir=/usr/lib32 \ + --libdir=/usr/lib32 \ --sysconfdir=/etc \ --with-xz \ --with-zlib \ - --host=i686-pc-linux-gnu \ --with-rootlibdir=/usr/lib32 Compile the package: @@ -136,13 +135,12 @@ make clean Prepare Kmod for compilation: CC="gcc -mx32" ./configure \ + --host=x86_64-pc-linux-gnux32 \ --prefix=/usr \ - --bindir=/bin \ --libdir=/usr/libx32 \ --sysconfdir=/etc \ --with-xz \ --with-zlib \ - --host=x86_64-pc-linux-gnux32 \ --with-rootlibdir=/usr/libx32 Compile the package: diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml index cbdfa155d..35c574714 100644 --- a/chapter08/libelf.xml +++ b/chapter08/libelf.xml @@ -82,9 +82,9 @@ rm /usr/lib/libelf.a Prepare Libtool for compilation: CC="gcc -m32" ./configure \ - --prefix=/usr \ - --libdir=/usr/lib32 \ --host=i686-pc-linux-gnu \ + --prefix=/usr \ + --libdir=/usr/lib32 \ --disable-debuginfod \ --enable-libdebuginfod=dummy @@ -115,9 +115,9 @@ rm -rf DESTDIR Prepare Libtool for compilation: CC="gcc -mx32" ./configure \ + --host=x86_64-pc-linux-gnux32 \ --prefix=/usr \ --libdir=/usr/lib32 \ - --host=x86_64-pc-linux-gnux32 \ --disable-debuginfod \ --enable-libdebuginfod=dummy diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index 7174ce0bf..2b4698a8e 100644 --- a/chapter08/libtool.xml +++ b/chapter08/libtool.xml @@ -91,9 +91,9 @@ Prepare Libtool for compilation: CC="gcc -m32" ./configure \ - --prefix=/usr \ - --libdir=/usr/lib32 \ - --host=i686-pc-linux-gnu + --host=i686-pc-linux-gnu \ + --prefix=/usr \ + --libdir=/usr/lib32 Compile the package: @@ -121,9 +121,9 @@ rm -rf DESTDIR Prepare Libtool for compilation: CC="gcc -mx32" ./configure \ - --prefix=/usr \ - --libdir=/usr/libx32 \ - --host=x86_64-pc-linux-gnux32 + --host=x86_64-pc-linux-gnux32 \ + --prefix=/usr \ + --libdir=/usr/libx32 Compile the package: diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml index 3f6d41dd5..786863b05 100644 --- a/chapter08/openssl.xml +++ b/chapter08/openssl.xml @@ -116,7 +116,6 @@ CC="gcc -m32 -march=i686" \ CXX="g++ -m32 -march=i686" \ ./config \ --prefix=/usr \ - --libdir=/usr/lib32 \ --openssldir=/etc/ssl \ --libdir=lib32 \ shared \ @@ -152,7 +151,6 @@ CC="gcc -mx32" \ CXX="g++ -mx32" \ ./config \ --prefix=/usr \ - --libdir=/usr/libx32 \ --openssldir=/etc/ssl \ --libdir=libx32 \ shared \ diff --git a/chapter08/readline.xml b/chapter08/readline.xml index aaefb44f2..dca718219 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -114,10 +114,10 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install Prepare Readline for compilation: CC="gcc -m32" ./configure \ - --prefix=/usr \ - --libdir=/usr/lib32 \ - --disable-static \ - --host=i686-pc-linux-gnu + --host=i686-pc-linux-gnu \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --disable-static Compile the package: @@ -145,10 +145,10 @@ rm -rf DESTDIR Prepare Readline for compilation: CC="gcc -mx32" ./configure \ - --prefix=/usr \ - --libdir=/usr/libx32 \ - --disable-static \ - --host=x86_64-pc-linux-gnux32 + --host=x86_64-pc-linux-gnux32 \ + --prefix=/usr \ + --libdir=/usr/libx32 \ + --disable-static Compile the package: diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index df1b3fc16..5aa9a38a1 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -119,6 +119,8 @@ su tester -c "make -k check" CC="gcc -m32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --host=i686-pc-linux-gnu \ + --libdir=/usr/lib32 \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ @@ -130,13 +132,13 @@ su tester -c "make -k check" --disable-static \ --without-python \ --without-systemd \ - --libdir=/usr/lib32 \ - --host=i686-pc-linux-gnu \ --without-systemdsystemunitdir \ --enable-libmount-force-mountinfo CC="gcc -m32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --host=i686-pc-linux-gnu \ + --libdir=/usr/lib32 \ --docdir=/usr/share/doc/util-linux-&util-linux-version; \ --disable-chfn-chsh \ --disable-login \ @@ -147,8 +149,6 @@ su tester -c "make -k check" --disable-pylibmount \ --disable-static \ --without-python \ - --libdir=/usr/lib32 \ - --host=i686-pc-linux-gnu \ --enable-libmount-force-mountinfo Compile the package: @@ -178,6 +178,8 @@ rm -rf DESTDIR CC="gcc -mx32" \ ./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; \ --disable-chfn-chsh \ --disable-login \ @@ -190,12 +192,12 @@ rm -rf DESTDIR --without-python \ --without-systemd \ --without-systemdsystemunitdir \ - --libdir=/usr/libx32 \ - --host=x86_64-pc-linux-gnux32 \ --enable-libmount-force-mountinfo CC="gcc -mx32" \ ./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; \ --disable-chfn-chsh \ --disable-login \ @@ -206,8 +208,6 @@ rm -rf DESTDIR --disable-pylibmount \ --disable-static \ --without-python \ - --libdir=/usr/libx32 \ - --host=x86_64-pc-linux-gnux32 \ --enable-libmount-force-mountinfo Compile the package: diff --git a/chapter08/xz.xml b/chapter08/xz.xml index e66da099c..faac1a090 100644 --- a/chapter08/xz.xml +++ b/chapter08/xz.xml @@ -78,10 +78,10 @@ Prepare Xz for compilation: CC="gcc -m32" ./configure \ - --prefix=/usr \ - --disable-static \ - --libdir=/usr/lib32 \ - --host=i686-pc-linux-gnu + --host=i686-pc-linux-gnu \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --disable-static Compile the package: @@ -109,10 +109,10 @@ rm -rf DESTDIR Prepare Xz for compilation: CC="gcc -mx32" ./configure \ - --prefix=/usr \ - --disable-static \ - --libdir=/usr/libx32 \ - --host=x86_64-pc-linux-gnux32 + --host=x86_64-pc-linux-gnux32 \ + --prefix=/usr \ + --libdir=/usr/libx32 \ + --disable-static Compile the package: diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml index 2d71b7bfd..38e997f4b 100644 --- a/chapter08/zstd.xml +++ b/chapter08/zstd.xml @@ -76,7 +76,7 @@ Install the package: -CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install +make prefix=/usr DESTDIR=$PWD/DESTDIR install cp -Rv DESTDIR/usr/lib/* /usr/lib32/ sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc rm -rf DESTDIR @@ -100,7 +100,7 @@ rm -rf DESTDIR Install the package: -CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install +make prefix=/usr DESTDIR=$PWD/DESTDIR install cp -Rv DESTDIR/usr/lib/* /usr/libx32/ sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc rm -rf DESTDIR