diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index 23941f6fd..16301f7d5 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -127,6 +127,11 @@ su tester -c "make -k check" make distclean + Move a tool out of the way which is optionally used by + configure but will report invalid pathes for multilib builds. + +mv /usr/bin/ncursesw6-config{,.tmp} + Prepare Util-linux for compilation: CC="gcc -m32" \ @@ -144,8 +149,7 @@ su tester -c "make -k check" --disable-static \ --without-python \ --without-systemd \ - --without-systemdsystemunitdir \ - --enable-libmount-force-mountinfo + --without-systemdsystemunitdir CC="gcc -m32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ @@ -160,8 +164,11 @@ su tester -c "make -k check" --disable-runuser \ --disable-pylibmount \ --disable-static \ - --without-python \ - --enable-libmount-force-mountinfo + --without-python + + Restore the tool previously moved away: + +mv /usr/bin/ncursesw6-config{.tmp,} Compile the package: @@ -186,6 +193,11 @@ rm -rf DESTDIR make distclean + Move a tool out of the way which is optionally used by + configure but will report invalid pathes for multilib builds. + +mv /usr/bin/ncursesw6-config{,.tmp} + Prepare Util-linux for compilation: CC="gcc -mx32" \ @@ -203,8 +215,7 @@ rm -rf DESTDIR --disable-static \ --without-python \ --without-systemd \ - --without-systemdsystemunitdir \ - --enable-libmount-force-mountinfo + --without-systemdsystemunitdir CC="gcc -mx32" \ ./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ @@ -219,8 +230,11 @@ rm -rf DESTDIR --disable-runuser \ --disable-pylibmount \ --disable-static \ - --without-python \ - --enable-libmount-force-mountinfo + --without-python + + Restore the tool previously moved away: + +mv /usr/bin/ncursesw6-config{.tmp,} Compile the package: