vm/external_libs/libptr_array/LICENSE vm/external_libs/libptr_array/Makefile vm/external_libs/libptr_array/ptr_array.c vm/external_libs/libptr_array/ptr_array.h vm/external_libs/libptr_array/tester.c @@ -3,7 +3,7 @@ extension do |e| e.files '*.c', '*.cpp' e.includes '.', '../../../vm/external_libs/libbstring', '../../../vm/external_libs/libmquark', - '../../../vm/external_libs/libmpa', + '../../../vm/external_libs/libptr_array', '../../../vm/external_libs/libcchash' e.pre_compile do lib/ext/melbourne/build.rb @@ -1,14 +1,19 @@ require 'mkmf' -dir_config("mquark") -dir_config("bstring") -dir_config("mpa") -dir_config("cchash") - -have_library("bstring") -have_library("mquark") -have_library("ptr_array") -have_library("cchash") +def add_lib(name) + i, lib = dir_config(name) + $libs << " #{lib}/lib#{name}.a " +end + +add_lib("mquark") +add_lib("bstring") +add_lib("ptr_array") +add_lib("cchash") + +#have_library("bstring") +#have_library("mquark") +#have_library("ptr_array") +#have_library("cchash") $CFLAGS += " -ggdb3" lib/ext/melbourne/extconf.rb @@ -95,11 +95,11 @@ namespace :compiler do libs = File.expand_path "../../vm/external_libs", __FILE__ ruby "extconf.rb --with-bstring-include=#{libs}/libbstring" \ " --with-mquark-include=#{libs}/libmquark" \ - " --with-mpa-include=#{libs}/libmpa" \ + " --with-ptr-array-include=#{libs}/libptr_array" \ " --with-cchash-include=#{libs}/libcchash" \ " --with-bstring-lib=#{libs}/libbstring" \ " --with-mquark-lib=#{libs}/libmquark" \ - " --with-mpa-lib=#{libs}/libmpa" \ + " --with-ptr_array-lib=#{libs}/libptr_array" \ " --with-cchash-lib=#{libs}/libcchash" \ " #{redirect}" rakelib/kernel.rake @@ -64,7 +64,7 @@ if config.use_jit end EX_INC = %w[ libtommath libgdtoa onig libffi/include - libbstring libcchash libmquark libmpa + libbstring libcchash libmquark libptr_array libltdl libev ].map { |f| "vm/external_libs/#{f}" } @@ -140,7 +140,7 @@ field_extract_headers = %w[ vm/builtin/weakref.hpp ] -EXTERNALS = %W[ vm/external_libs/libmpa/libptr_array.a +EXTERNALS = %W[ vm/external_libs/libptr_array/libptr_array.a vm/external_libs/libcchash/libcchash.a vm/external_libs/libmquark/libmquark.a vm/external_libs/libtommath/libtommath.a rakelib/vm.rake @@ -68,13 +68,13 @@ ifeq ($(CPU), powerpc) OPTIMIZATIONS+=-falign-loops=16 endif -CPPFLAGS += -I../libcchash -I../libmpa +CPPFLAGS += -I../libcchash -I../libptr_array CFLAGS += -fPIC $(CPPFLAGS) DEPS=quark.h SOURCES=quark.c OBJS=$(SOURCES:.c=.o) -LIBS=-L../libcchash -L../libmpa -lcchash -lptr_array -lm +LIBS=-L../libcchash -L../libptr_array -lcchash -lptr_array -lm %.o: %.c $(COMP) $(CFLAGS) $(OPTIMIZATIONS) -c $< -o $@ vm/external_libs/libmquark/Makefile vm/external_libs/libmpa/LICENSE vm/external_libs/libmpa/Makefile vm/external_libs/libmpa/ptr_array.c vm/external_libs/libmpa/ptr_array.h vm/external_libs/libmpa/tester.c b323a8b4b53d08473a453490d7af9202d17ff375 Evan Phoenix ephoenix@engineyard.com http://github.com/evanphx/rubinius/commit/3e0b86c11afcaae57b1805b21f355a82bfe7bba9 3e0b86c11afcaae57b1805b21f355a82bfe7bba9 2009-11-06T11:27:37-08:00 2009-11-06T11:27:14-08:00 Force extconf.rb to link things staticly b5e603bd04350dc6b4de39baa33317144ac61d41 Evan Phoenix ephoenix@engineyard.com