Rene Rebe
22 years ago
4 changed files with 51 additions and 184 deletions
Unified View
Diff Options
-
+0 -39package/mnemoc/boehm-gc/gcc3-noinst_gc_headers.diff
-
+33 -104package/mnemoc/boehm-gc/gcc3-use_system_gc.diff
-
+0 -39package/mnemoc/boehm-gc/pkg_gcc33_pre.conf
-
+18 -2package/mnemoc/boehm-gc/pkg_gcc3_pre.conf
@ -1,39 +0,0 @@ |
|||||
# --- 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-noinst_gc_headers.diff |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it 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. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
--- ./boehm-gc/include/Makefile.in.orig 2003-07-23 23:26:22.000000000 -0400
|
|
||||
+++ ./boehm-gc/include/Makefile.in 2003-07-23 23:37:07.000000000 -0400
|
|
||||
@@ -120,13 +120,7 @@
|
|
||||
|
|
||||
|
|
||||
install-includeHEADERS: $(include_HEADERS) |
|
||||
- @$(NORMAL_INSTALL)
|
|
||||
- $(mkinstalldirs) $(DESTDIR)$(includedir)
|
|
||||
- @list='$(include_HEADERS)'; for p in $$list; do \
|
|
||||
- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
|
|
||||
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
|
|
||||
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
|
|
||||
- done
|
|
||||
+ @echo RockLinux: i will not install old headers if i install boehm-gc as package.
|
|
||||
|
|
||||
uninstall-includeHEADERS: |
|
||||
@$(NORMAL_UNINSTALL) |
|
||||
@ -1,116 +1,45 @@ |
|||||
# --- 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 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it 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. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
--- ./Makefile.in.orig 2003-09-02 20:37:57.000000000 -0400
|
|
||||
+++ ./Makefile.in 2003-09-02 20:40:35.000000000 -0400
|
|
||||
@@ -799,7 +799,6 @@
|
|
||||
all-target-libffi \ |
|
||||
all-target-libjava \ |
|
||||
all-target-zlib \ |
|
||||
- all-target-boehm-gc \
|
|
||||
all-target-qthreads \ |
|
||||
all-target-bsp \ |
|
||||
all-target-cygmon |
|
||||
@@ -822,7 +821,6 @@
|
|
||||
configure-target-libffi \ |
|
||||
configure-target-libjava \ |
|
||||
configure-target-zlib \ |
|
||||
- configure-target-boehm-gc \
|
|
||||
configure-target-qthreads \ |
|
||||
configure-target-bsp \ |
|
||||
configure-target-cygmon |
|
||||
@@ -839,7 +837,6 @@
|
|
||||
check-target-libffi \ |
|
||||
check-target-libjava \ |
|
||||
check-target-zlib \ |
|
||||
- check-target-boehm-gc \
|
|
||||
check-target-qthreads \ |
|
||||
check-target-gperf |
|
||||
|
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 |
||||
|
|
||||
@@ -857,7 +854,6 @@
|
|
||||
install-target-bsp \ |
|
||||
install-target-libjava \ |
|
||||
install-target-zlib \ |
|
||||
- install-target-boehm-gc \
|
|
||||
install-target-qthreads \ |
|
||||
install-target-gperf |
|
||||
|
@@ -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 |
||||
|
|
||||
@@ -947,7 +943,6 @@
|
|
||||
clean-target-libffi \ |
|
||||
clean-target-libjava \ |
|
||||
clean-target-zlib \ |
|
||||
- clean-target-boehm-gc \
|
|
||||
clean-target-qthreads \ |
|
||||
clean-target-bsp \ |
|
||||
clean-target-cygmon |
|
||||
@@ -1714,8 +1709,6 @@
|
|
||||
all-bfd: all-libiberty all-intl |
|
||||
all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl |
|
||||
all-bison: all-texinfo |
|
||||
-configure-target-boehm-gc: $(ALL_GCC_C) configure-target-qthreads
|
|
||||
-all-target-boehm-gc: configure-target-boehm-gc
|
|
||||
configure-target-bsp: $(ALL_GCC_C) |
|
||||
all-target-bsp: configure-target-bsp |
|
||||
all-byacc: |
|
||||
@@ -1770,8 +1763,8 @@
|
|
||||
|
@@ -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 |
||||
|
|
||||
configure-target-libffi: $(ALL_GCC_C) |
|
||||
all-target-libffi: configure-target-libffi |
|
||||
-configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
|
|
||||
-all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
|
|
||||
+configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-qthreads configure-target-libffi
|
|
||||
+all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-qthreads all-target-libffi
|
|
||||
configure-target-librx: $(ALL_GCC_C) |
|
||||
all-target-librx: configure-target-librx |
|
||||
configure-target-libstdc++-v3: $(ALL_GCC_C) |
|
||||
--- ./libjava/configure.orig 2003-09-02 20:40:47.000000000 -0400
|
|
||||
+++ ./libjava/configure 2003-09-02 20:42:22.000000000 -0400
|
|
||||
@@ -3132,12 +3132,12 @@
|
|
||||
|
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 |
case "$GC" in |
||||
boehm) |
boehm) |
||||
echo "$ac_t""boehm" 1>&6 |
echo "$ac_t""boehm" 1>&6 |
||||
- GCLIBS=../boehm-gc/libgcjgc_convenience.la
|
- GCLIBS=../boehm-gc/libgcjgc_convenience.la
|
||||
- GCINCS='-I$(top_srcdir)/../boehm-gc/include'
|
|
||||
+ GCLIBS='$(prefix)/lib/libgc.la'
|
|
||||
+ GCINCS='-I$(prefix)/include/gc'
|
|
||||
|
+ GCLIBS=$(prefix)/lib/libgc.la
|
||||
JC1GCSPEC='-fuse-boehm-gc' |
JC1GCSPEC='-fuse-boehm-gc' |
||||
- GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
|
|
||||
+ #GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
|
|
||||
|
- 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="$GCINCS `cat ../boehm-gc/boehm-cflags`"
|
|
||||
+ # GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
|
|
||||
|
- GCINCS="`cat ../boehm-gc/boehm-cflags`"
|
||||
|
+ GCINCS="-I$(prefix)/include/gc"
|
||||
GCOBJS=boehm.lo |
GCOBJS=boehm.lo |
||||
GCHDR=boehm-gc.h |
GCHDR=boehm-gc.h |
||||
cat >> confdefs.h <<\EOF |
cat >> confdefs.h <<\EOF |
||||
--- ./libjava/libltdl/configure.orig 2003-09-02 20:42:37.000000000 -0400
|
|
||||
+++ ./libjava/libltdl/configure 2003-09-02 20:43:27.000000000 -0400
|
|
||||
@@ -2508,8 +2508,8 @@
|
|
||||
|
|
||||
GCINCS= |
|
||||
if test "$GC" = "boehm"; then |
|
||||
- GCINCS='-I$(top_srcdir)/../../boehm-gc/include'
|
|
||||
- GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
|
|
||||
+ GCINCS='-I$(prefix)/include/gc'
|
|
||||
+ #GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
|
|
||||
cat >> confdefs.h <<\EOF |
|
||||
#define HAVE_BOEHM_GC 1 |
|
||||
EOF |
|
||||
@ -1,39 +0,0 @@ |
|||||
# --- 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/pkg_gcc33_pre.conf |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it 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. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
if [ $stagelevel -gt 1 ]; then |
|
||||
pkg_boehmgc_confdir=$base/package/mnemoc/boehm-gc |
|
||||
# use boehm's GC (system) in objc |
|
||||
if [ "$( eval "echo \$ROCKCFG_PKG_BOEHMGC_OBJC${pkg#gcc}" )" == "1" ]; then |
|
||||
hook_add preconf 3 "var_append confopt ' ' '--enable-objc-gc'" |
|
||||
fi |
|
||||
|
|
||||
# use system boehm's GC in java |
|
||||
if [ "$( eval "echo \$ROCKCFG_PKG_BOEHMGC_JAVA${pkg#gcc}" )" == "1" ]; then |
|
||||
var_append patchfiles ' ' \ |
|
||||
$pkg_boehmgc_confdir/$pkg-use_system_gc.diff |
|
||||
fi |
|
||||
|
|
||||
if [ -f $pkg_boehmgc_confdir/$pkg-noinst_gc_headers.diff ]; then |
|
||||
var_append patchfiles ' ' $pkg_boehmgc_confdir/$pkg-noinst_gc_headers.diff |
|
||||
fi |
|
||||
fi |
|
||||