fix cross compilation of win32 binary gem, fix mixed case file naming
--HG-- rename : postgres => POSTGRES
This commit is contained in:
parent
1218cfbf56
commit
82f04b8f63
|
@ -7,8 +7,8 @@ History.rdoc
|
||||||
LICENSE
|
LICENSE
|
||||||
Manifest.txt
|
Manifest.txt
|
||||||
POSTGRES
|
POSTGRES
|
||||||
README-OS_X.rdoc
|
readme-os_x.rdoc
|
||||||
README-Windows.rdoc
|
readme-windows.rdoc
|
||||||
README.ja.rdoc
|
README.ja.rdoc
|
||||||
README.rdoc
|
README.rdoc
|
||||||
Rakefile
|
Rakefile
|
||||||
|
|
1
Rakefile
1
Rakefile
|
@ -114,7 +114,6 @@ Rake::ExtensionTask.new do |ext|
|
||||||
"--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
|
"--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
|
||||||
"--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
|
"--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
|
||||||
"--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
|
"--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
|
||||||
"--enable-static-build",
|
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ require 'mkmf'
|
||||||
|
|
||||||
if ENV['MAINTAINER_MODE']
|
if ENV['MAINTAINER_MODE']
|
||||||
$stderr.puts "Maintainer mode enabled."
|
$stderr.puts "Maintainer mode enabled."
|
||||||
$CFLAGS <<
|
$CFLAGS <<
|
||||||
' -Wall' <<
|
' -Wall' <<
|
||||||
' -ggdb' <<
|
' -ggdb' <<
|
||||||
' -DDEBUG' <<
|
' -DDEBUG' <<
|
||||||
|
@ -32,7 +32,7 @@ if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_exe
|
||||||
$stderr.puts "Using config values from %s" % [ pgconfig ]
|
$stderr.puts "Using config values from %s" % [ pgconfig ]
|
||||||
$CPPFLAGS << " -I%s" % [ `"#{pgconfig}" --includedir`.chomp ]
|
$CPPFLAGS << " -I%s" % [ `"#{pgconfig}" --includedir`.chomp ]
|
||||||
$LDFLAGS << " -L%s" % [ `"#{pgconfig}" --libdir`.chomp ]
|
$LDFLAGS << " -L%s" % [ `"#{pgconfig}" --libdir`.chomp ]
|
||||||
$LIBS << " " << `"#{pgconfig}" --libs`.chomp
|
$LIBS << " " << `"#{pgconfig}" --libs`.chomp unless ENV['CROSS_COMPILING']
|
||||||
else
|
else
|
||||||
$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
|
$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
|
||||||
" --with-pg-config=/path/to/pg_config"
|
" --with-pg-config=/path/to/pg_config"
|
||||||
|
|
Loading…
Reference in New Issue