From: Lzu Tao <taolzu@gmail.com>
Date: Fri, 28 Dec 2018 04:20:33 +0000 (+0700)
Subject: meson: Correct generating pkgconf after Meson v0.49.0
X-Git-Tag: v1.4.0^2~62^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=787a72cdfe2f50c64dc08c991c289f38d680ad86;p=thirdparty%2Fzstd.git

meson: Correct generating pkgconf after Meson v0.49.0
---

diff --git a/build/meson/lib/meson.build b/build/meson/lib/meson.build
index 8854d4370..a02bd2d7a 100644
--- a/build/meson/lib/meson.build
+++ b/build/meson/lib/meson.build
@@ -116,9 +116,9 @@ libzstd = library('zstd',
 libzstd_dep = declare_dependency(link_with: libzstd,
   include_directories: libzstd_includes)
 
-pkgconfig.generate(name: 'libzstd',
+pkgconfig.generate(libzstd,
+  name: 'libzstd',
   filebase: 'libzstd',
-  libraries: [libzstd],
   description: 'fast lossless compression algorithm library',
   version: zstd_libversion,
   url: 'http://www.zstd.net/')
diff --git a/build/meson/meson.build b/build/meson/meson.build
index 99173f50c..6543158eb 100644
--- a/build/meson/meson.build
+++ b/build/meson/meson.build
@@ -11,9 +11,11 @@
 project('zstd',
   ['c', 'cpp'],
   license: ['BSD', 'GPLv2'],
-  default_options : ['c_std=c99',
+  default_options : [
+    'c_std=c99',
     'cpp_std=c++11',
-    'buildtype=release'],
+    'buildtype=release'
+  ],
   version: '1.3.8',
   meson_version: '>=0.47.0')