pkg-config 1.5.0 → 1.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/NEWS +15 -0
- data/lib/pkg-config/version.rb +1 -1
- data/lib/pkg-config.rb +33 -30
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bd3801ee52598218ff2e302d7f3333061b37e37b11c05f358bd879c74fe08830
|
|
4
|
+
data.tar.gz: 555996afc720c1df211f3ab1a50df6187dc8c25319f7b7f6c7e2968f48584f7a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c178151d14bab1004d468c23250b4b46e1d6eda4d21df0001773f16dbb75df959b60f6408ee77e24fbbea9ac1bfd20618b480d8c55fe08d081a49acb0ece6509
|
|
7
|
+
data.tar.gz: 6f442145770a3ceaaa70d4de5c25845e141a8d50fd7ab0fa22a1114fad9abaf70c8e6d0cf11b012569d812883b282f9be96896a2534efd175391af61f0f98609
|
data/NEWS
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
= NEWS
|
|
2
2
|
|
|
3
|
+
== 1.5.2 - 2023-06-25
|
|
4
|
+
|
|
5
|
+
=== Improvements
|
|
6
|
+
|
|
7
|
+
* Added support for conda.
|
|
8
|
+
|
|
9
|
+
== 1.5.1 - 2022-11-23
|
|
10
|
+
|
|
11
|
+
=== Improvements
|
|
12
|
+
|
|
13
|
+
* Improved the default search path. "/usr" in "/usr/bin/pkg-config"
|
|
14
|
+
isn't used for buidling the default search path if "pkg-config
|
|
15
|
+
--variable=pc_path pkg-config" is available.
|
|
16
|
+
[Reported by Watson][GitHub:#22]
|
|
17
|
+
|
|
3
18
|
== 1.5.0 - 2022-11-23
|
|
4
19
|
|
|
5
20
|
=== Improvements
|
data/lib/pkg-config/version.rb
CHANGED
data/lib/pkg-config.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright 2008-
|
|
1
|
+
# Copyright 2008-2023 Sutou Kouhei <kou@cozmixng.org>
|
|
2
2
|
#
|
|
3
3
|
# This library is free software; you can redistribute it and/or
|
|
4
4
|
# modify it under the terms of the GNU Lesser General Public
|
|
@@ -158,24 +158,38 @@ class PackageConfig
|
|
|
158
158
|
end
|
|
159
159
|
if default_paths.nil?
|
|
160
160
|
arch_depended_path = Dir.glob("/usr/lib/*/pkgconfig")
|
|
161
|
-
default_paths = [
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
"/
|
|
168
|
-
|
|
169
|
-
"/
|
|
170
|
-
"/
|
|
171
|
-
"/
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
"
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
161
|
+
default_paths = []
|
|
162
|
+
pkg_config_prefix = native_pkg_config_prefix
|
|
163
|
+
if pkg_config_prefix
|
|
164
|
+
pkg_config_arch_depended_paths =
|
|
165
|
+
Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
|
|
166
|
+
default_paths.concat(pkg_config_arch_depended_paths)
|
|
167
|
+
default_paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
|
|
168
|
+
default_paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
|
|
169
|
+
default_paths << (pkg_config_prefix + "lib/pkgconfig").to_s
|
|
170
|
+
default_paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
|
|
171
|
+
default_paths << (pkg_config_prefix + "share/pkgconfig").to_s
|
|
172
|
+
end
|
|
173
|
+
conda_prefix = ENV["CONDA_PREFIX"]
|
|
174
|
+
if conda_prefix
|
|
175
|
+
default_paths << File.join(conda_prefix, "lib", "pkgconfig")
|
|
176
|
+
end
|
|
177
|
+
default_paths << "/usr/local/lib64/pkgconfig"
|
|
178
|
+
default_paths << "/usr/local/libx32/pkgconfig"
|
|
179
|
+
default_paths << "/usr/local/lib/pkgconfig"
|
|
180
|
+
default_paths << "/usr/local/libdata/pkgconfig"
|
|
181
|
+
default_paths << "/usr/local/share/pkgconfig"
|
|
182
|
+
default_paths << "/opt/local/lib/pkgconfig"
|
|
183
|
+
default_paths.concat(arch_depended_path)
|
|
184
|
+
default_paths << "/usr/lib64/pkgconfig"
|
|
185
|
+
default_paths << "/usr/libx32/pkgconfig"
|
|
186
|
+
default_paths << "/usr/lib/pkgconfig"
|
|
187
|
+
default_paths << "/usr/libdata/pkgconfig"
|
|
188
|
+
default_paths << "/usr/X11R6/lib/pkgconfig"
|
|
189
|
+
default_paths << "/usr/X11R6/share/pkgconfig"
|
|
190
|
+
default_paths << "/usr/X11/lib/pkgconfig"
|
|
191
|
+
default_paths << "/opt/X11/lib/pkgconfig"
|
|
192
|
+
default_paths << "/usr/share/pkgconfig"
|
|
179
193
|
end
|
|
180
194
|
if Object.const_defined?(:RubyInstaller)
|
|
181
195
|
mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
|
|
@@ -186,17 +200,6 @@ class PackageConfig
|
|
|
186
200
|
default_paths.unshift(libdir) if libdir
|
|
187
201
|
|
|
188
202
|
paths = []
|
|
189
|
-
pkg_config_prefix = native_pkg_config_prefix
|
|
190
|
-
if pkg_config_prefix
|
|
191
|
-
pkg_config_arch_depended_paths =
|
|
192
|
-
Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s)
|
|
193
|
-
paths.concat(pkg_config_arch_depended_paths)
|
|
194
|
-
paths << (pkg_config_prefix + "lib64/pkgconfig").to_s
|
|
195
|
-
paths << (pkg_config_prefix + "libx32/pkgconfig").to_s
|
|
196
|
-
paths << (pkg_config_prefix + "lib/pkgconfig").to_s
|
|
197
|
-
paths << (pkg_config_prefix + "libdata/pkgconfig").to_s
|
|
198
|
-
paths << (pkg_config_prefix + "share/pkgconfig").to_s
|
|
199
|
-
end
|
|
200
203
|
if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
|
|
201
204
|
/\A(\d+\.\d+)/ =~ run_command("sw_vers", "-productVersion")
|
|
202
205
|
mac_os_version = $1
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: pkg-config
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.5.
|
|
4
|
+
version: 1.5.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kouhei Sutou
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-06-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-unit
|
|
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
89
89
|
- !ruby/object:Gem::Version
|
|
90
90
|
version: '0'
|
|
91
91
|
requirements: []
|
|
92
|
-
rubygems_version: 3.
|
|
92
|
+
rubygems_version: 3.5.0.dev
|
|
93
93
|
signing_key:
|
|
94
94
|
specification_version: 4
|
|
95
95
|
summary: A pkg-config implementation for Ruby
|