rubygems-requirements-system 0.1.1 → 0.1.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/doc/text/news.md +6 -0
- data/lib/rubygems-requirements-system/pkg-config.rb +26 -11
- data/lib/rubygems-requirements-system/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8983a82a4286b4991c0b50470b4a19d518b943a1507bddaf2942c9adb8cb6426
|
4
|
+
data.tar.gz: 3795392e6f8f41fd623851e1df0464e00379a2e93987f951076c93e86f079a36
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4eb08d8b22664f846335544748dc0db9b50ac0146c3c49e077542ccc36d3ed6401f0be2e547dfbfeb4561a9e86077486f24224f689f9746b3ec2d801f0217815
|
7
|
+
data.tar.gz: 29012e76f40aaf145987ff502c7f08255715847e22c72eb31cc7725f9d4b9369fd310d2eccabfd04e75b412e90c02fb87f673cfa089b0fb3f1c4b41da340e955
|
data/doc/text/news.md
CHANGED
@@ -19,7 +19,7 @@ require "rbconfig"
|
|
19
19
|
require "shellwords"
|
20
20
|
|
21
21
|
module PKGConfig
|
22
|
-
VERSION = "1.6.
|
22
|
+
VERSION = "1.6.3"
|
23
23
|
|
24
24
|
@@paths = []
|
25
25
|
@@override_variables = {}
|
@@ -340,21 +340,34 @@ class PackageConfig
|
|
340
340
|
if brew
|
341
341
|
homebrew_repository = run_command("brew", "--repository")
|
342
342
|
if homebrew_repository
|
343
|
-
|
344
|
-
|
343
|
+
homebrew_repository_candidates <<
|
344
|
+
Pathname(homebrew_repository.strip)
|
345
|
+
end
|
346
|
+
homebrew_prefix = run_command("brew", "--prefix")
|
347
|
+
if homebrew_prefix
|
348
|
+
homebrew_repository_candidates <<
|
349
|
+
Pathname(homebrew_prefix.strip)
|
345
350
|
end
|
346
351
|
end
|
347
352
|
homebrew_repository_candidates.uniq.each do |candidate|
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
353
|
+
mac_pkgconfig_base_path =
|
354
|
+
candidate + "Library/Homebrew/os/mac/pkgconfig"
|
355
|
+
mac_pkgconfig_path = mac_pkgconfig_base_path + mac_os_version
|
356
|
+
unless mac_pkgconfig_path.exist?
|
357
|
+
mac_pkgconfig_path =
|
358
|
+
mac_pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
|
352
359
|
end
|
353
|
-
paths <<
|
360
|
+
paths << mac_pkgconfig_path.to_s if mac_pkgconfig_path.exist?
|
361
|
+
|
362
|
+
pkgconfig_path = candidate + "lib/pkgconfig"
|
363
|
+
paths << pkgconfig_path.to_s if pkgconfig_path.exist?
|
354
364
|
end
|
355
365
|
end
|
356
366
|
paths.concat(default_paths)
|
357
|
-
|
367
|
+
[
|
368
|
+
with_config("pkg-config-path") || ENV["PKG_CONFIG_PATH"],
|
369
|
+
*paths,
|
370
|
+
].compact.join(SEPARATOR)
|
358
371
|
end
|
359
372
|
|
360
373
|
def run_command(*command_line)
|
@@ -388,8 +401,10 @@ class PackageConfig
|
|
388
401
|
@name = name
|
389
402
|
end
|
390
403
|
@options = options
|
391
|
-
|
392
|
-
|
404
|
+
@paths = [
|
405
|
+
@options[:path],
|
406
|
+
self.class.default_path,
|
407
|
+
].compact.join(SEPARATOR).split(SEPARATOR)
|
393
408
|
@paths.unshift(*(@options[:paths] || []))
|
394
409
|
@paths = normalize_paths(@paths)
|
395
410
|
@msvc_syntax = @options[:msvc_syntax]
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rubygems-requirements-system
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sutou Kouhei
|
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
78
78
|
- !ruby/object:Gem::Version
|
79
79
|
version: '0'
|
80
80
|
requirements: []
|
81
|
-
rubygems_version: 3.6.
|
81
|
+
rubygems_version: 3.6.9
|
82
82
|
specification_version: 4
|
83
83
|
summary: Users can install system packages automatically on "gem install"
|
84
84
|
test_files: []
|