Changeset 02796f8

Timestamp:

12/08/2020 12:23:56 AM (3 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

f82ef49

Parents:

fe42b2f

Message:

Patch meson so that the pkgconfig file for sysprof in BLFS is created correctly.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12067 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (1 diff)
• chapter08/meson.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -45 +45 @@
     <listitem>
       <itemizedlist>
+      <para>2020-12-07</para>
+        <listitem>
+          <para>[ken] - Patch meson-0.56.0 to correctly create pkgconfig
+          files re static libraries (re sysprof in BLFS) . Fixes
+          <ulink url="&lfs-ticket-root;4765">#4675</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
       <para>2020-12-03</para>
         <listitem>

chapter01/whatsnew.xml

@@ -283 +283 @@
     </listitem>
     <listitem>
+      <para>meson-0.56.0-upstream_fix-1.patch</para>
+    </listitem>
+    <listitem>
       <para>systemd-247-upstream_fixes-1.patch</para>
     </listitem>

chapter03/patches.xml

@@ -83 +83 @@
       </listitem>
     </varlistentry>
+
+    <varlistentry>
+      <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&meson-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>

chapter08/meson.xml

@@ -48 +48 @@
   <sect2 role="installation">
     <title>Installation of Meson</title>
+
+    <para>First, apply a patch that fixes an issue with pkgconfig files
+    for static libraries:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
 
     <para>Compile Meson with the following command:</para>

patches.ent

@@ -54 +54 @@
 <!ENTITY libpipeline-checks-patch-size "22 KB">
 -->
+
+<!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-1.patch">
+<!ENTITY meson-fix-patch-md5 "589012d95c80f256e569598caf27c9a6">
+<!ENTITY meson-fix-patch-size "2.2 KB">
+
 <!--
 <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">