Permalink
Browse files

Remove no longer needed crc_t configure check

This is now handled in the extconf.rb for the extension itself.
  • Loading branch information...
dbussink committed Jul 5, 2012
1 parent 290404f commit 046b9f92b069e67b6ebad0fd3dbfcfc455a363ed
Showing with 2 additions and 32 deletions.
  1. +1 −1 Rakefile
  2. +1 −30 configure
  3. +0 −1 vm/ontology.cpp
View
@@ -33,7 +33,7 @@ end
require config_rb
BUILD_CONFIG = Rubinius::BUILD_CONFIG
-unless BUILD_CONFIG[:config_version] == 157
+unless BUILD_CONFIG[:config_version] == 158
STDERR.puts "Your configuration is outdated, please run ./configure first"
exit 1
end
View
@@ -123,7 +123,7 @@ class Configure
@libversion = "2.0"
@version = "#{@libversion}.0dev"
@release_date = "yyyy-mm-dd"
- @config_version = 157
+ @config_version = 158
# TODO: add conditionals for platforms
if RbConfig::CONFIG["build_os"] =~ /darwin/
@@ -913,31 +913,6 @@ int main() { return tgetnum(""); }
@log.write @curses ? @curses : "not found"
end
- def detect_zlib_crc_table_size
- @log.print "Checking zlib crc_table size: "
-
- status = check_program(true, ['z']) do |f|
- src = <<-EOP
-#include <zlib.h>
-
-int main() {
-#ifdef z_crc_t
- return sizeof(z_crc_t);
-#else
- return sizeof(get_crc_table()[0]);
-#endif
-}
- EOP
- f.puts src
- @log.log src
- end
-
- @zlib_crc_table_size = status
- @log.write "#{@zlib_crc_table_size}"
- end
-
-
-
def detect_include_dirs
@include_dirs = @include_dirs.select {|p| File.directory? p }
end
@@ -1054,7 +1029,6 @@ int main() {
# review this and make sure we update it properly to
# match the newer version which like will have uint32_t
# as the type.
- @zlib_crc_table_size = sizeof("long")
@include_dirs << "#{@vendordir}/zlib"
@lib_dirs << "#{@vendordir}/zlib"
end
@@ -1176,7 +1150,6 @@ int main() {
detect_libc_name
- detect_zlib_crc_table_size
detect_endian
detect_tr1_hash
detect_x86
@@ -1387,8 +1360,6 @@ end
f.puts %[#define RBX_ZLIB_PATH ""]
end
- f.puts %[#define RBX_ZLIB_CRC_TABLE_SIZE #{@zlib_crc_table_size}]
-
@supported_versions.each do |ver|
f.puts "#define RBX_DEFAULT_#{ver} #{ver == @default_version}"
end
View
@@ -427,7 +427,6 @@ namespace rubinius {
G(rubinius)->set_const(state, "SITE_PATH", String::create(state, RBX_SITE_PATH));
G(rubinius)->set_const(state, "VENDOR_PATH", String::create(state, RBX_VENDOR_PATH));
G(rubinius)->set_const(state, "ZLIB_PATH", String::create(state, RBX_ZLIB_PATH));
- G(rubinius)->set_const(state, "ZLIB_CRC_TABLE_SIZE", Fixnum::from(RBX_ZLIB_CRC_TABLE_SIZE));
G(rubinius)->set_const(state, "VERSION", String::create(state, RBX_VERSION));
G(rubinius)->set_const(state, "LIB_VERSION", String::create(state, RBX_LIB_VERSION));

0 comments on commit 046b9f9

Please sign in to comment.