diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-05-31 23:48:19 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-01 14:25:56 +0100 |
| commit | fce4f351701efa0ff95c7966b83289fc24092452 (patch) | |
| tree | 72822fc65e872a633270f2a9a9971f5a94869c17 | |
| parent | 6306c56804dddcda1a0916d00be0fa927950cf92 (diff) | |
| download | meson-fce4f351701efa0ff95c7966b83289fc24092452.zip meson-fce4f351701efa0ff95c7966b83289fc24092452.tar.gz meson-fce4f351701efa0ff95c7966b83289fc24092452.tar.bz2 | |
Remove do-nothing extraframework method from libwmf and pcap
libwmf and pcap allegedly support method:extraframework, but this does
nothing but return not-found. Possibly cut-and-pasted from elsewhere?
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 745dff0..19874fc 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -459,10 +459,7 @@ class PcapDependency(ExternalDependency): @staticmethod def get_methods(): - if mesonlib.is_osx(): - return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK] - else: - return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL] + return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL] @staticmethod def get_pcap_lib_version(ctdep): @@ -542,7 +539,4 @@ class LibWmfDependency(ExternalDependency): @staticmethod def get_methods(): - if mesonlib.is_osx(): - return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK] - else: - return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL] + return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL] |