diff options
Diffstat (limited to 'ports/pkgconf/fix-static-builds.patch')
| -rw-r--r-- | ports/pkgconf/fix-static-builds.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/ports/pkgconf/fix-static-builds.patch b/ports/pkgconf/fix-static-builds.patch deleted file mode 100644 index 88a0b375c..000000000 --- a/ports/pkgconf/fix-static-builds.patch +++ /dev/null @@ -1,54 +0,0 @@ -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') |
