From 054deb517ad9dee241d6785c3f51d5797b5b916d Mon Sep 17 00:00:00 2001 From: Zeckmathederg Date: Sat, 6 Jul 2024 05:47:01 -0600 Subject: [PATCH] Adjusted sections pertaining and fix link issue. Link issue has to deal with /introduction/welcome/important.xml where var &blfs-svn; was spelt as &blvs-svn;. --- introduction/welcome/changelog.xml | 3 ++ introduction/welcome/important.xml | 2 +- multilib/mesonfiles.xml | 58 ++++++++++++++++-------------- multilib/pkgconf.xml | 10 +++--- 4 files changed, 41 insertions(+), 32 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 5f1c72cffb..d6c34561e0 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -42,6 +42,9 @@ July 6th, 2024 + + [Zeckmathederg] - Adjusted sections pertaining and fix link issue. + [Zeckmathederg] - Added '--disable-static' to lib32-libvorbis. diff --git a/introduction/welcome/important.xml b/introduction/welcome/important.xml index cdc559950b..cb0fa108a8 100644 --- a/introduction/welcome/important.xml +++ b/introduction/welcome/important.xml @@ -13,7 +13,7 @@ BLFS has more information regarding compilation, /usr vs /usr/local, boot scripts, etc. at - . + . Unlike this book, this would be a chapter in BLFS. A lot of that information has been omitted as this book is more linear and doesn't follow how BLFS follows. However, we will cover some bases diff --git a/multilib/mesonfiles.xml b/multilib/mesonfiles.xml index 8128bb5503..2718367f2f 100644 --- a/multilib/mesonfiles.xml +++ b/multilib/mesonfiles.xml @@ -11,34 +11,40 @@ Meson Toolchain Files - - Most applications that rely on the Meson - build system have decent support for cross compilation, ie. compiling - 32-bit binaries on a 64-bit system. It can be as easy as setting the - CC, CXX, and PKG_CONFIG_PATH - variables before using the meson setup .. - command to compile 32-bit binaries on a 64-bit system. - However, some projects are more complicated for many different - reasons, leading to the necessity of Meson - toolchain files. They specify compilers, - options that should be invoked, the pkg-conf - binary (or rather symlink that uses a certain personality file) to use, - llvm-config to use, etc. This is required for Mesa's - Nouveau and/or Swrast Vulkan drivers. It is also needed for Gstreamer - (not in the book), which is a recommended dependency of - . - + + Introduction to Meson Toolchain Files + + + Most applications that rely on the Meson + build system have decent support for cross compilation, ie. compiling + 32-bit binaries on a 64-bit system. It can be as easy as setting the + CC, CXX, and PKG_CONFIG_PATH + variables before using the meson setup .. + command to compile 32-bit binaries on a 64-bit system. + However, some projects are more complicated for many different + reasons, leading to the necessity of Meson + toolchain files. They specify compilers, + options that should be invoked, the pkg-conf + binary (or rather symlink that uses a certain personality file) to use, + llvm-config to use, etc. This is required for Mesa's + Nouveau and/or Swrast Vulkan drivers. It is also needed for Gstreamer + (not in the book), which is a recommended dependency of + . + - - There are two Meson files: the cross - toolchain file and the native toolchain file. There are different situations - for using either. - + + There are two Meson files: the cross + toolchain file and the native toolchain file. There are different situations + for using either. + - - The instructions below will show how to create and use the files if - necessary. - + Meson Toolchain File Dependencies + Required + + (runtime) + + + Creating the Cross Toolchain File diff --git a/multilib/pkgconf.xml b/multilib/pkgconf.xml index 995ee35d1a..e35aacc9eb 100644 --- a/multilib/pkgconf.xml +++ b/multilib/pkgconf.xml @@ -26,15 +26,15 @@ - Creating the personalites + Creating the personalites - Create the following personalties as the - root - user: + Create the following personalties as the + root + user: - mkdir -pv /usr/share/pkgconfig/personality.d +mkdir -pv /usr/share/pkgconfig/personality.d cat > /usr/share/pkgconfig/personality.d/x86_64-pc-linux-gnu.personality << "EOF" Triplet: x86_64-pc-linux-gnu