@@ -23,3 +23,8 @@ Fr - architecture agnostic compiled files fan - C warnings hunter +Eero Saynatkari <rubinius-ml@projects.kittensoft.org> +- 'rue' on irc +- Miscellaneous codings +- 64-bit and *BSD support +- Newsletterist AUTHORS @@ -1,5 +1,5 @@ #!/bin/sh -cd shotgun; ./mkconfig.sh +cd shotgun; bash ./mkconfig.sh echo "Rubinius is configured." configure @@ -1,6 +1,10 @@ include config.mk +# Respect the environment +ifeq ($(CC),) CC=gcc +endif + COMP=$(LIBTOOL) --mode=compile $(CC) LINKER=$(LIBTOOL) --mode=link $(CC) INSTALL=$(LIBTOOL) --mode=install install @@ -13,7 +17,15 @@ else endif UNAME=$(shell uname) +MARCH=$(shell uname -m) + CFLAGS=-Wall -g -ggdb3 -I../include -iquote . -iquote lib `pkg-config glib-2.0 --cflags` -Iexternal_libs/cinvoke/lib + +# amd64 must have fPIC shared +ifeq ($(MARCH),amd64) + CFLAGS+=-fPIC +endif + DEPS=../include/rubinius.h ALIBS=external_libs/libtommath/libtommath.a external_libs/onig/.libs/libonig.a external_libs/libzip/lib/.libs/libzip.a external_libs/libltdl/.libs/libltdl.a external_libs/libevent/.libs/libevent.a @@ -66,19 +78,19 @@ external_libs/libtommath/libtommath.a: cd external_libs/libtommath; $(MAKE) external_libs/onig/.libs/libonig.a: - cd external_libs/onig; ./configure; $(MAKE) + cd external_libs/onig; CFLAGS=-fPIC ./configure; $(MAKE) external_libs/libzip/lib/.libs/libzip.a: - cd external_libs/libzip; ./configure; $(MAKE) + cd external_libs/libzip; CFLAGS=-fPIC ./configure; $(MAKE) external_libs/cinvoke/lib/libcinvoke.a: - cd external_libs/cinvoke; ./configure; $(MAKE) + cd external_libs/cinvoke; CFLAGS=-fPIC ./configure; $(MAKE) external_libs/libevent/.libs/libevent.a: - cd external_libs/libevent; ./configure; $(MAKE) libevent.la + cd external_libs/libevent; CFLAGS=-fPIC ./configure; $(MAKE) libevent.la external_libs/libltdl/.libs/libltdl.a: - cd external_libs/libltdl; ./configure; $(MAKE) + cd external_libs/libltdl; CFLAGS=-fPIC ./configure; $(MAKE) librubinius.la: config.h $(ALIBS) cd lib; $(MAKE) librubinius.la shotgun/Makefile @@ -1,6 +1,10 @@ -include ../config.mk -CC=gcc +# Respect ENV +ifeq ($(CC),) + CC=gcc +endif + COMP=$(LIBTOOL) --mode=compile $(CC) LINKER=$(LIBTOOL) --mode=link $(CC) UNAME=$(shell uname) @@ -13,7 +17,9 @@ else endif CPPFLAGS=-I../../include -I .. -iquote . -I../external_libs/libevent -I../external_libs/onig -I../external_libs/libtommath -I../external_libs/libzip/lib -I../external_libs/libltdl `pkg-config glib-2.0 --cflags` + WARNINGS=-Wall -Winline + LIBS=`pkg-config glib-2.0 --libs` -lz ../external_libs/libtommath/libtommath.a ../external_libs/onig/.libs/libonig.a ../external_libs/libzip/lib/.libs/libzip.a $(SINGLE_MODULE) ../external_libs/libevent/.libs/libevent.a ../external_libs/libltdl/.libs/libltdl.a -lm ifdef USE_CINVOKE @@ -21,6 +27,16 @@ CPPFLAGS+= -I../external_libs/cinvoke/lib LIBS+= ../external_libs/cinvoke/lib/libcinvoke.a endif +# BSD do not require a separate libdl +ifeq ($(UNAME),FreeBSD) + # Pass +else ifeq ($(UNAME),OpenBSD) + # Pass +else + LIBS+="-ldl" +endif + + ifdef DEV OPTIMIZATIONS= WARNINGS=-Wall @@ -65,7 +81,7 @@ subtend/PortableUContext_asm.lo: rm -f $@.$$$$ librubinius.la: show_info $(DEPS) $(LOBJS) - MACOSX_DEPLOYMENT_TARGET=10.4 $(LINKER) -release $(VERSION) -o librubinius.la $(LOBJS) -rpath $(LIBPATH) -ldl $(LIBS) + MACOSX_DEPLOYMENT_TARGET=10.4 $(LINKER) -release $(VERSION) -o librubinius.la $(LOBJS) -rpath $(LIBPATH) $(LIBS) cpu_instructions.o: instructions.gen instruction_names.gen cpu_primitives.o: system_primitives.gen shotgun/lib/Makefile @@ -20,6 +20,8 @@ else DISABLE_KQUEUE=0 fi +echo "CC=$CC" + if which glibtool > /dev/null; then echo "LIBTOOL=glibtool" else shotgun/mkconfig.sh be335f97499bc721ef448db93522503f154974ef Eero Saynatkari eero@kittensoft.org http://github.com/evanphx/rubinius/commit/22d4f08ce7a0307814b2185f991af600c8802ab8 22d4f08ce7a0307814b2185f991af600c8802ab8 2007-05-06T19:58:42-07:00 2007-05-06T19:58:42-07:00 * Explicit fPIC for building shared libs on amd64 * Allow setting CC for ./configure * Remove libdl linking where not necessary dffaa295fd49153950383ac8abf582863e17b101 Eero Saynatkari eero@kittensoft.org