pkg-config 1.0.7 → 1.0.8
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.
- data/NEWS +4 -0
- data/lib/pkg-config.rb +10 -4
- metadata +24 -8
data/NEWS
CHANGED
data/lib/pkg-config.rb
CHANGED
@@ -103,7 +103,7 @@ class PackageConfig
|
|
103
103
|
@options = options
|
104
104
|
path = @options[:path] || ENV["PKG_CONFIG_PATH"]
|
105
105
|
@paths = [path, guess_default_path].compact.join(SEPARATOR).split(SEPARATOR)
|
106
|
-
@paths.unshift(@options[:paths] || [])
|
106
|
+
@paths.unshift(*(@options[:paths] || []))
|
107
107
|
@msvc_syntax = @options[:msvc_syntax]
|
108
108
|
@variables = @declarations = nil
|
109
109
|
override_variables = self.class.custom_override_variables
|
@@ -186,7 +186,7 @@ class PackageConfig
|
|
186
186
|
end
|
187
187
|
|
188
188
|
def collect_cflags
|
189
|
-
all_cflags =
|
189
|
+
all_cflags = required_packages.collect do |package|
|
190
190
|
self.class.new(package, @options).cflags
|
191
191
|
end
|
192
192
|
all_cflags = [declaration("Cflags")] + all_cflags
|
@@ -204,7 +204,7 @@ class PackageConfig
|
|
204
204
|
end
|
205
205
|
|
206
206
|
def collect_libs
|
207
|
-
all_libs =
|
207
|
+
all_libs = required_packages.collect do |package|
|
208
208
|
self.class.new(package, @options).libs
|
209
209
|
end
|
210
210
|
all_libs = [declaration("Libs")] + all_libs
|
@@ -287,10 +287,16 @@ class PackageConfig
|
|
287
287
|
(pkg_config.parent.parent + "libdata" + "pkgconfig").to_s,
|
288
288
|
default_path].join(SEPARATOR)
|
289
289
|
end
|
290
|
+
|
291
|
+
def required_packages
|
292
|
+
(requires_private + requires.reverse).reject do |package|
|
293
|
+
@name == package
|
294
|
+
end.uniq
|
295
|
+
end
|
290
296
|
end
|
291
297
|
|
292
298
|
module PKGConfig
|
293
|
-
VERSION = "1.0.
|
299
|
+
VERSION = "1.0.8"
|
294
300
|
|
295
301
|
@@paths = []
|
296
302
|
@@override_variables = {}
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pkg-config
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 7
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 1.0.
|
9
|
+
- 8
|
10
|
+
version: 1.0.8
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Kouhei Sutou
|
@@ -15,25 +15,41 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date:
|
18
|
+
date: 2011-01-30 00:00:00 +09:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
|
-
name:
|
22
|
+
name: rubyforge
|
23
23
|
prerelease: false
|
24
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
25
25
|
none: false
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
hash:
|
29
|
+
hash: 7
|
30
30
|
segments:
|
31
31
|
- 2
|
32
|
-
- 4
|
33
32
|
- 0
|
34
|
-
|
33
|
+
- 4
|
34
|
+
version: 2.0.4
|
35
35
|
type: :development
|
36
36
|
version_requirements: *id001
|
37
|
+
- !ruby/object:Gem::Dependency
|
38
|
+
name: hoe
|
39
|
+
prerelease: false
|
40
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
41
|
+
none: false
|
42
|
+
requirements:
|
43
|
+
- - ">="
|
44
|
+
- !ruby/object:Gem::Version
|
45
|
+
hash: 21
|
46
|
+
segments:
|
47
|
+
- 2
|
48
|
+
- 6
|
49
|
+
- 1
|
50
|
+
version: 2.6.1
|
51
|
+
type: :development
|
52
|
+
version_requirements: *id002
|
37
53
|
description: A pkg-cofnig implementation by Ruby
|
38
54
|
email:
|
39
55
|
- kou@cozmixng.org
|