From 0a8481c779203e6666d3812024c2173f105010e4 Mon Sep 17 00:00:00 2001 From: Tox Date: Fri, 25 Oct 2024 11:40:14 -0500 Subject: [PATCH 1/5] disabled tests and added libxslt as an optional dependency --- shareddeps/security/glib2.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/shareddeps/security/glib2.xml b/shareddeps/security/glib2.xml index c5dcb44297..e5d4e16295 100644 --- a/shareddeps/security/glib2.xml +++ b/shareddeps/security/glib2.xml @@ -74,9 +74,14 @@ Recommended - + (if not built, Meson will try to fetch a tarball of PCRE2 source code from the internet) + + + Optional + + libxslt (for man-pages) Additional Runtime Dependencies @@ -142,6 +147,7 @@ meson setup .. \ -D introspection=disabled \ -D glib_debug=disabled \ -D man-pages=disabled \ + -D tests=disabled \ -D sysprof=disabled && ninja @@ -209,6 +215,7 @@ ninja -D introspection=disabled \ -D glib_debug=disabled \ -D man-pages=disabled \ + -D tests=disabled \ -D sysprof=disabled && ninja @@ -235,6 +242,14 @@ ldconfig build to create and install the package man pages. + + -D tests=disabled: This switch causes tests + to be built. It is disabled because it is beyond the scope of GLFS. + If you'd like to test glib, reference + + BLFS's glib page. + + -D glib_debug=disabled: This switch causes the build to not include some expensive checks for debugging in the built From 61c12f741548f8b6ae29a7cf767aef0d3cde6d04 Mon Sep 17 00:00:00 2001 From: Tox Date: Fri, 25 Oct 2024 13:40:35 -0500 Subject: [PATCH 2/5] added an SQLite check --- shareddeps/net/nss.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/shareddeps/net/nss.xml b/shareddeps/net/nss.xml index 4489868d20..c0d855e120 100644 --- a/shareddeps/net/nss.xml +++ b/shareddeps/net/nss.xml @@ -99,6 +99,24 @@ 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 prevent a build failure: + + +sqlite3 --version > /dev/null 2>&1 && 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!" >&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." +fi + + + Install NSS by running the following commands: From 2a1ac1e81fc71a62f46626dd87507220b0b7643a Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Fri, 25 Oct 2024 10:48:16 -0600 Subject: [PATCH 3/5] Mesa: Notified people of NVK 32-bit build being borked. --- introduction/welcome/changelog.xml | 10 ++++++++++ shareddeps/drivers/mesa.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index f6117524b0..5836be4587 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -39,6 +39,16 @@ --> + + October 25th, 2024 + + + [Zeckmathederg] - Mesa: Notified people of NVK 32-bit build + being borked. + + + + October 24th, 2024 diff --git a/shareddeps/drivers/mesa.xml b/shareddeps/drivers/mesa.xml index f0d12aeaf8..7f9fe08847 100644 --- a/shareddeps/drivers/mesa.xml +++ b/shareddeps/drivers/mesa.xml @@ -282,6 +282,16 @@ ldconfig 32-bit Installation of NVK and Vulkan Swrast + + Building for NVK 32-bit right now is borked. The cause is unclear, + but what does happen is a file full of bindings is not properly generated + for 32-bit, causing an overflow error. This was the case before the + driver could be built, but now it is once again borked and cannot be + built. You may follow these instructions if you wish, but for now, it is + recommened to use instead if you have a nVidia + card. + + Feel free to skip this section if you don't want to install the From e0614e8855cf77a96dd022c10ab65f818c8f8f95 Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Fri, 25 Oct 2024 16:03:47 -0600 Subject: [PATCH 4/5] rust-bindgen: 0.70.1 -> 0.69.4. This downgrade fixes the lib32 NVK build in Mesa as the new version generates the bindings for libnak improperly for 32-bit. Perhaps an ABI issue. Also added the commit from Toxikuu in the changelog. And removed the notification to users saying NVK cannot be built. --- introduction/welcome/changelog.xml | 9 +++++++++ packages.ent | 2 +- shareddeps/drivers/llvm.xml | 8 ++++++++ shareddeps/drivers/mesa.xml | 19 ++++++------------- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 5836be4587..ea728034b9 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,15 @@ October 25th, 2024 + + [Zeckmathederg] - rust-bindgen: 0.70.1 -> 0.69.4. + + + [Toxikuu] - GLib2: Disabled tests and added libxslt as an + optional dependency. PR + (#29) + + [Zeckmathederg] - Mesa: Notified people of NVK 32-bit build being borked. diff --git a/packages.ent b/packages.ent index bcd200bf77..a8796ddd67 100644 --- a/packages.ent +++ b/packages.ent @@ -140,7 +140,7 @@ - + diff --git a/shareddeps/drivers/llvm.xml b/shareddeps/drivers/llvm.xml index 4d4521a97f..2614c2204b 100644 --- a/shareddeps/drivers/llvm.xml +++ b/shareddeps/drivers/llvm.xml @@ -179,6 +179,14 @@ mv projects/compiler-rt-&llvm-version;.src projects/compiler-rtgrep -rl '#!.*python' | xargs sed -i '1s/python$/python3/' + + Ensure installing the FileCheck program which is + needed by the test suite of some packages (for example + rustc-&rust-version;): + + + sed 's/utility/tool/' -i utils/FileCheck/CMakeLists.txt + Install LLVM by running the following commands: diff --git a/shareddeps/drivers/mesa.xml b/shareddeps/drivers/mesa.xml index 7f9fe08847..50325e8b14 100644 --- a/shareddeps/drivers/mesa.xml +++ b/shareddeps/drivers/mesa.xml @@ -282,16 +282,6 @@ ldconfig 32-bit Installation of NVK and Vulkan Swrast - - Building for NVK 32-bit right now is borked. The cause is unclear, - but what does happen is a file full of bindings is not properly generated - for 32-bit, causing an overflow error. This was the case before the - driver could be built, but now it is once again borked and cannot be - built. You may follow these instructions if you wish, but for now, it is - recommened to use instead if you have a nVidia - card. - - Feel free to skip this section if you don't want to install the @@ -305,11 +295,14 @@ ldconfig few paths in a personality file used by Pkgconf, as it searches in /usr rather than - $XORG_PREFIX. If the expanded - path is /usr, skip to the compilation - instructions. + $XORG_PREFIX. + + If the expanded path is /usr, skip to cleaning + the build directory. + + Change the paths in the Pkgconf personality file as the root user: From 7d32ac4f4f0d7621c2bd9ae5a42aba793271b3d8 Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Fri, 25 Oct 2024 19:13:55 -0600 Subject: [PATCH 5/5] NSS: Fixed a build issue if SQLite is not completely installed. PR (#30) Co-authored-by: Tox --- introduction/welcome/changelog.xml | 8 +++++++- shareddeps/net/nss.xml | 25 +++++++++++++++++-------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index ea728034b9..af7b891375 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -43,7 +43,13 @@ October 25th, 2024 - [Zeckmathederg] - rust-bindgen: 0.70.1 -> 0.69.4. + [Toxikuu] - NSS: Fixed a build issue if SQLite + is not completely installed. PR + (#30) + + + + [Zeckmathederg] - rust-bindgen: 0.70.1 -> 0.69.4. [Toxikuu] - GLib2: Disabled tests and added libxslt as an diff --git a/shareddeps/net/nss.xml b/shareddeps/net/nss.xml index c0d855e120..a58bc776f5 100644 --- a/shareddeps/net/nss.xml +++ b/shareddeps/net/nss.xml @@ -103,16 +103,12 @@ 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 prevent a build failure: + following command to remove a problematic library: -sqlite3 --version > /dev/null 2>&1 && 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!" >&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." +sqlite3 --version > /dev/null 2>&1 || +if [ -f /usr/lib/libsqlite3.so ]; then + rm -vf /usr/lib/libsqlite3.so fi @@ -230,6 +226,19 @@ install -v -m644 Linux*/lib/pkgconfig/nss.pc /usr/lib/pkgconfignss. + + + If you're rebuilding NSS and you have not installed SQLite, run the + following command to remove a problematic library: + + +sqlite3 --version > /dev/null 2>&1 || +if [ -f /usr/lib32/libsqlite3.so ]; then + rm -vf /usr/lib32/libsqlite3.so +fi + + + Install lib32-NSS by running the following commands: