pkg-config 1.5.0 → 1.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/NEWS +9 -0
- data/lib/pkg-config/version.rb +1 -1
- data/lib/pkg-config.rb +28 -29
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c90e9d9dd81d99b7fd6412e1befe74deaabf67d3c181d50261846a2da0fe9d43
|
|
4
|
+
data.tar.gz: 9dd90a3ffc4e140bce369c8b45ba0c34ba8f3ccea6f0a49ce884b8ba6a2d9825
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: de054c89cbe328715e28258636442959dfbca1c859e1fbff4f076bd945e019ced3aa0515f69cdb470288c76811b2d0138293b65398470acc24415c4631f298bc
|
|
7
|
+
data.tar.gz: a5414ffd42e1bc9cdde74df9ae83689473c9799ef7b6606ee9bb02379017b42db93b5d80f550820f9cea9befddd2a3402cf65435290b0f78db578c55480b9c00
|
data/NEWS
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
= NEWS
|
|
2
2
|
|
|
3
|
+
== 1.5.1 - 2022-11-23
|
|
4
|
+
|
|
5
|
+
=== Improvements
|
|
6
|
+
|
|
7
|
+
* Improved the default search path. "/usr" in "/usr/bin/pkg-config"
|
|
8
|
+
isn't used for buidling the default search path if "pkg-config
|
|
9
|
+
--variable=pc_path pkg-config" is available.
|
|
10
|
+
[Reported by Watson][GitHub:#22]
|
|
11
|
+
|
|
3
12
|
== 1.5.0 - 2022-11-23
|
|
4
13
|
|
|
5
14
|
=== Improvements
|
data/lib/pkg-config/version.rb
CHANGED
data/lib/pkg-config.rb
CHANGED
|
@@ -158,24 +158,34 @@ 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
|
+
default_paths << "/usr/local/lib64/pkgconfig"
|
|
174
|
+
default_paths << "/usr/local/libx32/pkgconfig"
|
|
175
|
+
default_paths << "/usr/local/lib/pkgconfig"
|
|
176
|
+
default_paths << "/usr/local/libdata/pkgconfig"
|
|
177
|
+
default_paths << "/usr/local/share/pkgconfig"
|
|
178
|
+
default_paths << "/opt/local/lib/pkgconfig"
|
|
179
|
+
default_paths.concat(arch_depended_path)
|
|
180
|
+
default_paths << "/usr/lib64/pkgconfig"
|
|
181
|
+
default_paths << "/usr/libx32/pkgconfig"
|
|
182
|
+
default_paths << "/usr/lib/pkgconfig"
|
|
183
|
+
default_paths << "/usr/libdata/pkgconfig"
|
|
184
|
+
default_paths << "/usr/X11R6/lib/pkgconfig"
|
|
185
|
+
default_paths << "/usr/X11R6/share/pkgconfig"
|
|
186
|
+
default_paths << "/usr/X11/lib/pkgconfig"
|
|
187
|
+
default_paths << "/opt/X11/lib/pkgconfig"
|
|
188
|
+
default_paths << "/usr/share/pkgconfig"
|
|
179
189
|
end
|
|
180
190
|
if Object.const_defined?(:RubyInstaller)
|
|
181
191
|
mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
|
|
@@ -186,17 +196,6 @@ class PackageConfig
|
|
|
186
196
|
default_paths.unshift(libdir) if libdir
|
|
187
197
|
|
|
188
198
|
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
199
|
if /-darwin\d[\d\.]*\z/ =~ RUBY_PLATFORM and
|
|
201
200
|
/\A(\d+\.\d+)/ =~ run_command("sw_vers", "-productVersion")
|
|
202
201
|
mac_os_version = $1
|