]> git.pld-linux.org Git - packages/ruby-pkg-config.git/blame - x32.patch
- fix for x32 dirs
[packages/ruby-pkg-config.git] / x32.patch
CommitLineData
c873f409
JR
1--- pkg-config-1.1.5/lib/pkg-config.rb~ 2015-12-19 22:10:31.000000000 +0100
2+++ pkg-config-1.1.5/lib/pkg-config.rb 2015-12-19 22:16:52.177522169 +0100
3@@ -222,7 +222,7 @@
4 all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
5 path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag}
6 path_flags = path_flags.reject do |flag|
7- /\A-L\/usr\/lib(?:64)?\z/ =~ flag
8+ /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag
9 end
10 if @msvc_syntax
11 path_flags = path_flags.collect do |flag|
12@@ -283,11 +283,13 @@
13 def guess_default_path
14 arch_depended_path = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
15 default_path = ["/usr/local/lib64/pkgconfig",
16+ "/usr/local/libx32/pkgconfig",
17 "/usr/local/lib/pkgconfig",
18 "/usr/local/libdata/pkgconfig",
19 "/opt/local/lib/pkgconfig",
20 arch_depended_path,
21 "/usr/lib64/pkgconfig",
22+ "/usr/libx32/pkgconfig",
23 "/usr/lib/pkgconfig",
24 "/usr/X11/lib/pkgconfig/",
25 "/opt/X11/lib/pkgconfig/",
26@@ -302,6 +304,7 @@
27 Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR)
28 [pkg_config_arch_depended_path,
29 (pkg_config_prefix + "lib64/pkgconfig").to_s,
30+ (pkg_config_prefix + "libx32/pkgconfig").to_s,
31 (pkg_config_prefix + "lib/pkgconfig").to_s,
32 (pkg_config_prefix + "libdata/pkgconfig").to_s,
33 default_path].join(SEPARATOR)
This page took 0.098292 seconds and 4 git commands to generate.