Merge remote-tracking branch 'upstream/master' into newgcc

jam7 · Jan 7, 2017 · 99a78f8 · 99a78f8
2 parents eb5497b + f04cf4e
commit 99a78f8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/pkgconfig.rb b/packages/pkgconfig.rb
@@ -1,14 +1,15 @@
 require 'package'
 
 class Pkgconfig < Package
-  version '0.28'
-  source_url 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz'
-  source_sha1 '71853779b12f958777bffcb8ca6d849b4d3bed46'
+  version '0.29.1'
+  source_url 'http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz'
+  source_sha1 '271ce928f6d673cc16cbced2bfd14a5f2e5d3d37'
 
   depends_on 'buildessential'
 
   def self.build
-      system "./configure --with-internal-glib --libdir=/usr/local/lib#{SHORTARCH}/ CC=\"gcc -m#{SHORTARCH}\" CFLAGS=\" -fPIC\""
+      # check lib64 on any architectures since it is not a problem to not exist lib64 directory.
+      system "./configure --with-internal-glib --with-pc-path=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/share/pkgconfig CFLAGS=\" -fPIC\""
       system "make"
   end