[DO-972][DO-980] add freetype and pkgconf recipes (!6)
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/6
This commit is contained in:
44
recipes/pkgconf/all/patches/1.7.4-0002-fix-static-link.patch
Normal file
44
recipes/pkgconf/all/patches/1.7.4-0002-fix-static-link.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index e7822b8da..8f7aa0075 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -45,6 +45,13 @@ cdata.set('abs_top_builddir', meson.build_root())
|
||||
|
||||
subdir('libpkgconf')
|
||||
|
||||
+libtype = get_option('default_library')
|
||||
+if libtype == 'static'
|
||||
+ build_static = '-DPKGCONFIG_IS_STATIC'
|
||||
+else
|
||||
+ build_static = '-DLIBPKGCONF_EXPORT'
|
||||
+endif
|
||||
+
|
||||
libpkgconf = library('pkgconf',
|
||||
'libpkgconf/argvsplit.c',
|
||||
'libpkgconf/audit.c',
|
||||
@@ -60,7 +67,7 @@ libpkgconf = library('pkgconf',
|
||||
'libpkgconf/pkg.c',
|
||||
'libpkgconf/queue.c',
|
||||
'libpkgconf/tuple.c',
|
||||
- c_args: '-DLIBPKGCONF_EXPORT',
|
||||
+ c_args: build_static,
|
||||
install : true,
|
||||
version : '3.0.0',
|
||||
soversion : '3',
|
||||
@@ -73,13 +80,16 @@ pkg.generate(libpkgconf,
|
||||
url: 'http://github.com/pkgconf/pkgconf',
|
||||
filebase : 'libpkgconf',
|
||||
subdirs: ['pkgconf'],
|
||||
+ extra_cflags : build_static
|
||||
)
|
||||
|
||||
+
|
||||
pkgconf_exe = executable('pkgconf',
|
||||
'cli/main.c',
|
||||
'cli/getopt_long.c',
|
||||
'cli/renderer-msvc.c',
|
||||
link_with : libpkgconf,
|
||||
+ c_args: build_static,
|
||||
install : true)
|
||||
|
||||
if get_option('tests')
|
||||
Reference in New Issue
Block a user