[patch] patch to make gauche build against system boehm-gc

gauche-no-gc.patch (text/plain), 5.02 KB, created by Tomás Touceda (RETIRED) on 2009-09-14 20:23:55 UTC

diff -Naur Gauche-0.8.14.orig/Makefile.in Gauche-0.8.14/Makefile.in
--- Gauche-0.8.14.orig/Makefile.in	2008-09-18 12:43:39.000000000 -0300
+++ Gauche-0.8.14/Makefile.in	2009-09-14 15:55:14.000000000 -0300
@@ -15,9 +15,8 @@
 datadir     = @datadir@
 datarootdir = @datarootdir@
 
-SUBDIRS = gc src lib ext doc
-SRIDBUS = doc ext lib src gc
-LIBATOMICDIR = gc/libatomic_ops-1.2
+SUBDIRS = src lib ext doc
+SRIDBUS = doc ext lib src 
 MKINSTDIR = @top_srcdir@/mkinstalldirs
 INSTALL = @INSTALL@
 GAUCHE_VERSION  = @GAUCHE_VERSION@
@@ -28,7 +27,7 @@
 GOSH = gosh
 
 CONFIG_GENERATED = Makefile config.cache config.log config.status config.threads \
-	           libtool configure.lineno autom4* gc/autom4*
+	           libtool configure.lineno autom4*
 AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure
 
 TESTRECORD = ./test.record
@@ -114,7 +113,7 @@
 	   (cd $(LIBATOMICDIR); $(MAKE) distclean; rm -f configure);\
 	fi
 	(cd winnt; $(MAKE) clean)
-	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X gc/configure
+	rm -rf $(AUTOCONF_GENERATED) VERSION INSTALL INSTALL.eucjp DIST_EXCLUDE_X
 
 # MacOSX Framework specific stuff
 framework: all
diff -Naur Gauche-0.8.14.orig/configure Gauche-0.8.14/configure
--- Gauche-0.8.14.orig/configure	2009-09-14 14:53:36.000000000 -0300
+++ Gauche-0.8.14/configure	2009-09-14 18:49:41.000000000 -0300
@@ -769,7 +769,6 @@
 LIBS
 CPPFLAGS
 CPP'
-ac_subdirs_all='gc'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -9296,7 +9295,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
+LIBS="-lm  -lgc $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9360,7 +9359,7 @@
 #define HAVE_LIBM 1
 _ACEOF
 
-  LIBS="-lm $LIBS"
+  LIBS="-lm -lgc $LIBS"
 
 fi
 
@@ -16437,7 +16436,6 @@
 
 
 
-subdirs="$subdirs gc"
 
 
 echo $GAUCHE_VERSION > VERSION
diff -Naur Gauche-0.8.14.orig/configure.ac Gauche-0.8.14/configure.ac
--- Gauche-0.8.14.orig/configure.ac	2008-10-06 07:38:56.000000000 -0300
+++ Gauche-0.8.14/configure.ac	2009-09-14 15:58:22.000000000 -0300
@@ -701,10 +701,6 @@
 AC_SUBST(CROSS_COMPILING_no)
 
 dnl ===========================================================
-dnl Configure gc and extensions
-AC_CONFIG_SUBDIRS(gc)
-
-dnl ===========================================================
 dnl Create output files
 echo $GAUCHE_VERSION > VERSION
 AC_OUTPUT(Makefile
diff -Naur Gauche-0.8.14.orig/ext/Makefile.ext.in Gauche-0.8.14/ext/Makefile.ext.in
--- Gauche-0.8.14.orig/ext/Makefile.ext.in	2008-09-18 12:43:11.000000000 -0300
+++ Gauche-0.8.14/ext/Makefile.ext.in	2009-09-14 16:24:43.000000000 -0300
@@ -27,7 +27,7 @@
 # These are set by configure
 DEFS     = @DEFS@
 OPTFLAGS = @OPTFLAGS@
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/gc/include @LOCAL_INC@ $(EXTRA_INCLUDES)
+INCLUDES = -I$(srcdir) -I$(top_srcdir)/src @LOCAL_INC@ $(EXTRA_INCLUDES)
 OBJEXT   = @OBJEXT@
 EXEEXT   = @EXEEXT@
 SOEXT    = @SHLIB_SO_SUFFIX@
diff -Naur Gauche-0.8.14.orig/src/Makefile.in Gauche-0.8.14/src/Makefile.in
--- Gauche-0.8.14.orig/src/Makefile.in	2009-09-14 14:53:33.000000000 -0300
+++ Gauche-0.8.14/src/Makefile.in	2009-09-14 18:45:45.000000000 -0300
@@ -55,7 +55,7 @@
 # These are set by configure
 DEFS     = @DEFS@
 OPTFLAGS = @OPTFLAGS@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../gc/include @LOCAL_INC@
+INCLUDES = -I$(srcdir) @LOCAL_INC@
 RANLIB   = @RANLIB@
 OBJEXT   = @OBJEXT@
 EXEEXT   = @EXEEXT@
@@ -111,12 +111,7 @@
 # certain circumstances (e.g. MacOSX framework build) it may be overridden.
 TARGETLIB=$(LIB_INSTALL_DIR)
 
-INSTALL_HEADERS = gauche.h \
-	../gc/include/gc.h ../gc/include/gc_allocator.h \
-	../gc/include/gc_config_macros.h ../gc/include/gc_cpp.h \
-	../gc/include/gc_inline.h ../gc/include/gc_mark.h \
-	../gc/include/gc_pthread_redirects.h ../gc/include/gc_tiny_fl.h \
-	../gc/include/gc_typed.h ../gc/include/gc_version.h 
+INSTALL_HEADERS = gauche.h 
 INSTALL_SUBHEADERS = \
 	gauche/arch.h gauche/bignum.h gauche/bits.h \
 	gauche/builtin-syms.h gauche/char_euc_jp.h gauche/char_none.h \
@@ -149,11 +144,9 @@
 
 # build -----------------------------------------------
 
-GCLIB = ../gc/libgc.la
-
 gosh_SOURCES = main.c
 gosh_OBJECTS = main.$(OBJEXT)
-gosh_LDADD   = -lgauche
+gosh_LDADD   = -lgauche -lgc
 gosh_LDFLAGS = @SHLIB_MAIN_LDFLAGS@
 
 libgauche_LIBRARY = libgauche.$(SOEXT)
@@ -186,7 +179,7 @@
 	$(LINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT) $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
 
 relink :
-	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)
+	$(RELINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
 	$(RELINK) $(gosh_LDFLAGS) -o gosh$(EXEEXT)  $(gosh_OBJECTS) $(gosh_LDADD) $(LIBS)
 
 $(OBJECTS) : $(HEADERS)
@@ -227,7 +220,7 @@
 paths.$(OBJEXT) : getdir_win.c getdir_dummy.c getdir_darwin.c
 
 libgauche.$(SOEXT) : $(libgauche_OBJECTS) $(GCLIB)
-	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) ../gc/.libs/*.o $(LIBS)
+	$(LINK) $(libgauche_LDFLAGS) libgauche.$(SOEXT) $(libgauche_OBJECTS) $(LIBS)
 	$(POSTBUILD)
 
 gauche-config$(EXEEXT) : gauche-config.$(OBJEXT)