rocklinux/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff

# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
# 
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
# 
# ROCK Linux: rock-src/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
# 
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# 
# --- ROCK-COPYRIGHT-NOTE-END ---

diff -ur gcc-3.4.0-orig/Makefile.in gcc-3.4.0/Makefile.in
--- gcc-3.4.0-orig/Makefile.in	2004-01-14 21:09:37.000000000 +0100
+++ gcc-3.4.0/Makefile.in	2004-05-05 13:59:55.000000000 +0200
@@ -609,7 +609,6 @@
     maybe-configure-target-libffi \
     maybe-configure-target-libjava \
     maybe-configure-target-zlib \
-    maybe-configure-target-boehm-gc \
     maybe-configure-target-qthreads \
     maybe-configure-target-rda
 
@@ -698,7 +697,6 @@
     maybe-all-target-libffi \
     maybe-all-target-libjava \
     maybe-all-target-zlib \
-    maybe-all-target-boehm-gc \
     maybe-all-target-qthreads \
     maybe-all-target-rda
 
@@ -792,7 +790,6 @@
     maybe-info-target-libffi \
     maybe-info-target-libjava \
     maybe-info-target-zlib \
-    maybe-info-target-boehm-gc \
     maybe-info-target-qthreads \
     maybe-info-target-rda
 
diff -ur gcc-3.4.0-orig/libjava/configure gcc-3.4.0/libjava/configure
--- gcc-3.4.0-orig/libjava/configure	2004-04-19 04:23:04.000000000 +0200
+++ gcc-3.4.0/libjava/configure	2004-05-05 14:05:25.000000000 +0200
@@ -4408,11 +4408,11 @@
 case "$GC" in
  boehm)
     echo "$ac_t""boehm" 1>&6
-    GCLIBS=../boehm-gc/libgcjgc_convenience.la
+    GCLIBS=$(prefix)/lib/libgc.la
     JC1GCSPEC='-fuse-boehm-gc'
-    GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
+    # GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
 
-            GCINCS="`cat ../boehm-gc/boehm-cflags`"
+    GCINCS="-I$(prefix)/include/gc"
     GCOBJS=boehm.lo
     GCHDR=boehm-gc.h
         cat >> confdefs.h <<\EOF