diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 5256cda91a..abfcd6594f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,9 @@ October 25th, 2024 + + [Zeckmathederg] - NSS: Work around make clean not working. + [Zeckmathederg] - Removed a stale file in book source. diff --git a/shareddeps/net/nss.xml b/shareddeps/net/nss.xml index a58bc776f5..171e680987 100644 --- a/shareddeps/net/nss.xml +++ b/shareddeps/net/nss.xml @@ -103,7 +103,7 @@ patch -Np1 -i ../nss-&nss-version;-illegal_instruction-1.patch If you're rebuilding NSS and you have not installed SQLite, run the - following command to remove a problematic library: + following command to remove a problematic library as the &root; user: sqlite3 --version > /dev/null 2>&1 || @@ -219,17 +219,18 @@ install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig 32-bit Installation of NSS - - Cleaning the directory doesn't work with NSS, so you will need to delete - the extracted folder from the tarball, extract it again, apply the patch - again as detailed in the normal installation, then change directory into - nss. - + + First clean directories in the source tree: + + +cd ../nss && +find -name "Linux*.OBJ" -type d -exec rm -rf {} + && +rm -rf ../dist If you're rebuilding NSS and you have not installed SQLite, run the - following command to remove a problematic library: + following command to remove a problematic library as the &root; user: sqlite3 --version > /dev/null 2>&1 || @@ -240,7 +241,7 @@ fi - Install lib32-NSS by running the following commands: + Now install lib32-NSS by running the following commands: CC="gcc -m32" CXX="g++ -m32" \