[PATCH 7/7] meson: Properly extract ABI versions for xorg-server.pc

Adam Jackson ajax at nwnk.net
Wed Mar 28 13:57:46 UTC 2018


On Wed, 2018-03-28 at 14:04 +0200, Thierry Reding wrote:
> From: Thierry Reding <treding at nvidia.com>
> 
> The newline in the middle of the awk expression confuses Meson and
> causes it to pass only the string before the newline to awk, which will
> subsequently fail because it encounters an unterminated string.
> 
> One fix would be to escape the newlines ('\\n'), but that causes the
> newline to end up in the pkg-config file and separate the ABI version
> lines by blank lines.
> 
> Instead, simply drop the newlines to make the generated pkg-config file
> look more like the one generated as part of the autotools-based build.
> 
> Signed-off-by: Thierry Reding <treding at nvidia.com>

Merged the series, thanks:

remote: I: patch #213395 updated using rev 66402fcd8280b393d3992121c0bcff9c646c97ed.
remote: I: patch #213396 updated using rev c62a8b60b9a07092ebebf9aeb67a0c39c583aabe.
remote: I: patch #213397 updated using rev b04ff31b9d471822fe96ed63eda93fc4cd8c22d0.
remote: I: patch #213398 updated using rev 0babe78ed5afec8a06a517346f39b5ebd003773c.
remote: I: patch #213399 updated using rev d905e3330fd4f9b15a0277b22d608705787cb8bc.
remote: I: patch #213400 updated using rev 465b38cadd573ce50eca959f4b56bf4a6a638d91.
remote: I: patch #213401 updated using rev 4303deae78c4e2a60856be87bf87cd1643c268f5.
remote: I: 7 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   0a7dabc86c..4303deae78  master -> master

If you could, please run:

git config --local format.subjectPrefix "PATCH xserver"

in your xserver checkout.

- ajax


More information about the xorg-devel mailing list