From 91cd9cb8e77f0775d176cc268bb43768e116457b Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Mon, 5 Dec 2016 12:44:25 +0100 Subject: [PATCH] split spec for Windows because macOS and Windows have incompatible pkgconfig versions. --- build.win32x86/third-party/pkgconfig/Makefile.lib | 2 +- third-party/pkgconfig.spec.win | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 third-party/pkgconfig.spec.win diff --git a/build.win32x86/third-party/pkgconfig/Makefile.lib b/build.win32x86/third-party/pkgconfig/Makefile.lib index 547c444abc..d096c33a0e 100644 --- a/build.win32x86/third-party/pkgconfig/Makefile.lib +++ b/build.win32x86/third-party/pkgconfig/Makefile.lib @@ -1,7 +1,7 @@ ifndef THIRDPARTYDIR include ../common/Makefile.lib.extra endif -include ../../third-party/pkgconfig.spec +include ../../third-party/pkgconfig.spec.win # plugin definitions PKGCONFIGURL:=$(pkgconfig_spec_download_url) diff --git a/third-party/pkgconfig.spec.win b/third-party/pkgconfig.spec.win new file mode 100644 index 0000000000..ad7b33133f --- /dev/null +++ b/third-party/pkgconfig.spec.win @@ -0,0 +1,7 @@ +# I need to use a different version of pkgconfig for windows because version 0.29.1 does not work +# with macOS and 0.23 does not work with Windows. +# Since this is a support library and it will not go to the final product, we do not care which +# version we use... +pkgconfig_spec_download_url:=http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz +pkgconfig_spec_archive_name:=pkg-config-0.29.1.tar.gz +pkgconfig_spec_unpack_dir_name:=pkg-config-0.29.1