diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-28 22:50:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 13:50:45 -0700 |
| commit | 7ab13e4d6902a2871f5ac3325e64fa6aafdf94c1 (patch) | |
| tree | 7d3e57aee3cc50bc812f0a6d36953fddae7e7ab4 /ports/pkgconf/fix-static-builds.patch | |
| parent | ee8c444d4d4c0b1c9540fd36a56232bddef6175c (diff) | |
| download | vcpkg-7ab13e4d6902a2871f5ac3325e64fa6aafdf94c1.tar.gz vcpkg-7ab13e4d6902a2871f5ac3325e64fa6aafdf94c1.zip | |
[pkgconf] Add new port (#17488)
* add new port pkgconf
* version stuff
* reformat manifest
* update version
* add supports field
* version stuff again
Diffstat (limited to 'ports/pkgconf/fix-static-builds.patch')
| -rw-r--r-- | ports/pkgconf/fix-static-builds.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/ports/pkgconf/fix-static-builds.patch b/ports/pkgconf/fix-static-builds.patch new file mode 100644 index 000000000..88a0b375c --- /dev/null +++ b/ports/pkgconf/fix-static-builds.patch @@ -0,0 +1,54 @@ +diff --git a/libpkgconf.pc.in b/libpkgconf.pc.in +index d278136e3..ef0c7db5f 100644 +--- a/libpkgconf.pc.in ++++ b/libpkgconf.pc.in +@@ -8,4 +8,4 @@ Description: a library for accessing and manipulating development framework conf + URL: http://github.com/pkgconf/pkgconf + Version: @PACKAGE_VERSION@ + CFlags: -I${includedir}/pkgconf +-Libs: -L${libdir} -lpkgconf ++Libs: -L${libdir} -lpkgconf @build_static@ +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 = '' ++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: ['-DLIBPKGCONF_EXPORT', 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') |