From 02796f856d605db3c56d203cb5389d14b33694d6 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Tue, 8 Dec 2020 00:23:56 +0000
Subject: [PATCH] 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
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter01/whatsnew.xml  |  3 +++
 chapter03/patches.xml   |  9 +++++++++
 chapter08/meson.xml     |  5 +++++
 patches.ent             |  5 +++++
 5 files changed, 33 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 730eee733..5f5189639 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <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>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 08d7bfda9..bc4b5df68 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -281,6 +281,9 @@
     <listitem>
       <para>autoconf-2.69-consolidated_fixes-1.patch</para>
     </listitem>
+    <listitem>
+      <para>meson-0.56.0-upstream_fix-1.patch</para>
+    </listitem>
     <listitem>
       <para>systemd-247-upstream_fixes-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 660077eae..fc7ce3291 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -82,6 +82,15 @@
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </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>
       <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index b3c3224c5..4076c4c5c 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -48,6 +48,11 @@
   <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>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
diff --git a/patches.ent b/patches.ent
index 8896e0254..c3e7cb5d2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -53,6 +53,11 @@
 <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
 <!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">
 <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">