linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-23 14:32:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

NSS: Fixed a build issue if SQLite is not completely installed. PR (#30)

Browse Source 
Co-authored-by: Tox <toxikuu@users.noreply.github.com>
This commit is contained in:
Zeckmathederg 2024-10-25 19:13:55 -06:00
parent e0614e8855
commit 7d32ac4f4f
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
introduction/welcome/changelog.xml
View File

@ -43,7 +43,13 @@
<para>October 25th, 2024</para>
<itemizedlist>
<listitem>
<para>[Zeckmathederg] - rust-bindgen: 0.70.1 -&gt; 0.69.4.<para>
<para>[Toxikuu] - NSS: Fixed a build issue if SQLite
is not completely installed. PR
<ulink url="https://github.com/Zeckmathederg/glfs/pull/30">(#30)</ulink>
</para>
</listitem>
<listitem>
<para>[Zeckmathederg] - rust-bindgen: 0.70.1 -&gt; 0.69.4.</para>
</listitem>
<listitem>
<para>[Toxikuu] - GLib2: Disabled tests and added libxslt as an

25
shareddeps/net/nss.xml
View File

@ -103,16 +103,12 @@ patch -Np1 -i ../nss-&nss-version;-illegal_instruction-1.patch</userinput></scre
<important>
<para>
If you're rebuilding NSS and you have not installed SQLite, run the
following command to prevent a build failure:
following command to remove a problematic library:
</para>
<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 &amp;&amp; echo -e "\nDetected an SQLite install. You may continue." ||
if [ -f /usr/lib/libsqlite3.so -o -f /usr/lib32/libsqlite3.so ]; then
echo -e "\nDetected an incomplete SQLite installation!" >&amp;2
rm -vf /usr/lib{,32}/libsqlite3.so
echo "Removed any problematic SQLite libraries. You may continue."
else
echo -e "\nNo SQLite install (complete or otherwise) detected. You may continue."
<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 ||
if [ -f /usr/lib/libsqlite3.so ]; then
rm -vf /usr/lib/libsqlite3.so
fi</userinput></screen>
</important>
@ -230,6 +226,19 @@ install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfig</userinput></sc
<filename>nss</filename>.
</para></note>
<important>
<para>
If you're rebuilding NSS and you have not installed SQLite, run the
following command to remove a problematic library:
</para>
<screen role="root"><userinput remap="pre">sqlite3 --version > /dev/null 2>&amp;1 ||
if [ -f /usr/lib32/libsqlite3.so ]; then
rm -vf /usr/lib32/libsqlite3.so
fi</userinput></screen>
</important>
<para>
Install <application>lib32-NSS</application> by running the following commands:
</para>