[ruby-gnome2-cvs] ruby-gnome2/pkg-config@afcfe2d [master] Return same result as pkg-config 0.29

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-07-20 22:06:43 +0900 (Thu, 20 Jul 2017)

  New Revision: afcfe2dc90a5c24fc534c672924fea7e0d98f3f0
  https://github.com/ruby-gnome2/pkg-config/commit/afcfe2dc90a5c24fc534c672924fea7e0d98f3f0

  Message:
    Return same result as pkg-config 0.29
    
    GitHub: fix #13
    
    Reported by dai. Thanks!!!

  Modified files:
    lib/pkg-config.rb

  Modified: lib/pkg-config.rb (+10 -1)
===================================================================
--- lib/pkg-config.rb    2017-05-29 21:44:39 +0900 (d048bf0)
+++ lib/pkg-config.rb    2017-07-20 22:06:43 +0900 (25cbf62)
@@ -208,7 +208,10 @@ class PackageConfig
   private
   def collect_cflags
     cflags_set = [declaration("Cflags")]
-    cflags_set += all_required_packages.collect do |package|
+    cflags_set += required_packages.collect do |package|
+      self.class.new(package, @options).cflags
+    end
+    cflags_set += private_required_packages.collect do |package|
       self.class.new(package, @options).cflags
     end
     all_cflags = normalize_cflags(Shellwords.split(cflags_set.join(" ")))
@@ -378,6 +381,12 @@ class PackageConfig
     end.uniq
   end
 
+  def private_required_packages
+    requires_private.reject do |package|
+      @name == package
+    end.uniq
+  end
+
   def all_required_packages
     (requires_private + requires.reverse).reject do |package|
       @name == package