diff --git a/package/mnemoc/boehm-gc/boehm-gc.desc b/package/mnemoc/boehm-gc/boehm-gc.desc index 9f0095786..2d0ca407e 100644 --- a/package/mnemoc/boehm-gc/boehm-gc.desc +++ b/package/mnemoc/boehm-gc/boehm-gc.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 6.3 +[V] 6.6 [P] X -?2------9 100.600 -[D] 1818041703 gc6.3.tar.gz http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ +[D] 2643893782 gc6.6.tar.gz http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ diff --git a/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff b/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff deleted file mode 100644 index a6d0b49be..000000000 --- a/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff +++ /dev/null @@ -1,64 +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-use_system_gc.diff -# ROCK Linux is Copyright (C) 1998 - 2005 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 diff --git a/package/mnemoc/boehm-gc/gcc33-use_system_gc.diff b/package/mnemoc/boehm-gc/gcc33-use_system_gc.diff deleted file mode 100644 index e888888db..000000000 --- a/package/mnemoc/boehm-gc/gcc33-use_system_gc.diff +++ /dev/null @@ -1,120 +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/gcc33-use_system_gc.diff -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - ---- ./Makefile.in.orig 2003-07-12 19:19:25.000000000 -0400 -+++ ./Makefile.in 2003-07-12 19:21:35.000000000 -0400 -@@ -761,7 +761,6 @@ - all-target-libffi \ - all-target-libjava \ - all-target-zlib \ -- all-target-boehm-gc \ - all-target-qthreads \ - all-target-rda - -@@ -781,7 +780,6 @@ - configure-target-libffi \ - configure-target-libjava \ - configure-target-zlib \ -- configure-target-boehm-gc \ - configure-target-qthreads \ - configure-target-rda - -@@ -798,7 +796,6 @@ - check-target-libffi \ - check-target-libjava \ - check-target-zlib \ -- check-target-boehm-gc \ - check-target-qthreads \ - check-target-rda - -@@ -817,7 +814,6 @@ - install-target-libffi \ - install-target-libjava \ - install-target-zlib \ -- install-target-boehm-gc \ - install-target-qthreads \ - install-target-rda - -@@ -898,7 +894,6 @@ - clean-target-libffi \ - clean-target-libjava \ - clean-target-zlib \ -- clean-target-boehm-gc \ - clean-target-qthreads \ - clean-target-rda - -@@ -1654,7 +1649,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-byacc: - all-bzip2: - all-db: -@@ -1694,8 +1688,8 @@ - all-build-libiberty: configure-build-libiberty - - configure-target-libffi: $(ALL_GCC_C) --configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi --all-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: all-fastjar all-target-zlib all-target-qthreads all-target-libffi - configure-target-libstdc++-v3: $(ALL_GCC_C) - all-target-libstdc++-v3: all-target-libiberty - all-libtool: -@@ -1772,7 +1766,6 @@ - all-target-libffi: configure-target-libffi - all-target-libjava: configure-target-libjava - all-target-zlib: configure-target-zlib --all-target-boehm-gc: configure-target-boehm-gc - all-target-qthreads: configure-target-qthreads - all-target-rda: configure-target-rda - ---- ./libjava/configure.orig 2003-07-14 13:10:59.000000000 -0400 -+++ ./libjava/configure 2003-07-14 13:12:01.000000000 -0400 -@@ -3235,12 +3235,12 @@ - case "$GC" in - boehm) - echo "$ac_t""boehm" 1>&6 -- GCLIBS=../boehm-gc/libgcjgc_convenience.la -- GCINCS='-I$(top_srcdir)/../boehm-gc/include' -+ GCLIBS='$(prefix)/lib/libgc.la' -+ GCINCS='-I$(prefix)/include/gc' - 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="$GCINCS `cat ../boehm-gc/boehm-cflags`" -+ # GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" - GCOBJS=boehm.lo - GCHDR=boehm-gc.h - cat >> confdefs.h <<\EOF ---- ./libjava/libltdl/configure.orig 2003-07-14 13:12:15.000000000 -0400 -+++ ./libjava/libltdl/configure 2003-07-14 13:13:03.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 diff --git a/package/mnemoc/boehm-gc/install_private_headers.diff b/package/mnemoc/boehm-gc/install_private_headers.diff deleted file mode 100644 index d0eb20cb4..000000000 --- a/package/mnemoc/boehm-gc/install_private_headers.diff +++ /dev/null @@ -1,59 +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/install_private_headers.diff -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - ---- ./include/Makefile.in.orig 2003-08-30 11:53:46.000000000 -0400 -+++ ./include/Makefile.in 2003-08-30 13:00:06.000000000 -0400 -@@ -124,12 +124,7 @@ - gc_allocator.h gc_backptr.h \ - gc_gcj.h gc_local_alloc.h leak_detector.h \ - gc_amiga_redirects.h gc_pthread_redirects.h \ -- gc_config_macros.h -- -- --# headers which are not installed --# --dist_noinst_HEADERS = private/gc_hdrs.h \ -+ gc_config_macros.h private/gc_hdrs.h \ - private/gc_priv.h private/gcconfig.h \ - private/gc_pmark.h private/gc_locks.h \ - private/solaris_threads.h private/dbg_mlc.h \ -@@ -138,6 +133,8 @@ - private/darwin_semaphore.h private/darwin_stop_world.h \ - cord.h ec.h javaxfc.h - -+dist_noinst_HEADERS = -+ - subdir = include - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = -@@ -168,11 +165,11 @@ - install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) -+ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)/private - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \ -- $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \ -+ echo " $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ -+ $(pkgincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ - done - - uninstall-pkgincludeHEADERS: diff --git a/package/mnemoc/boehm-gc/install_private_headers.in b/package/mnemoc/boehm-gc/install_private_headers.in deleted file mode 100644 index adf8f3212..000000000 --- a/package/mnemoc/boehm-gc/install_private_headers.in +++ /dev/null @@ -1,24 +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/install_private_headers.in -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- -flistdel="$flistdel|$prefix/include/gc/private/.*" -flistdel="$flistdel|$prefix/include/gc/(cord\.h|ec\.h|javaxfc\.h)" - diff --git a/package/mnemoc/boehm-gc/no_doc.patch b/package/mnemoc/boehm-gc/no_doc.patch deleted file mode 100644 index 47382b816..000000000 --- a/package/mnemoc/boehm-gc/no_doc.patch +++ /dev/null @@ -1,30 +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/no_doc.patch -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - ---- ./Makefile.in.orig 2003-08-29 21:59:51.000000000 -0400 -+++ ./Makefile.in 2003-08-29 22:01:07.000000000 -0400 -@@ -121,7 +121,7 @@ - - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = doc include -+SUBDIRS = include - - - # documentation which is not installed diff --git a/package/mnemoc/boehm-gc/pkg_gcc2_pre.conf b/package/mnemoc/boehm-gc/pkg_gcc2_pre.conf deleted file mode 100644 index c16d93fc3..000000000 --- a/package/mnemoc/boehm-gc/pkg_gcc2_pre.conf +++ /dev/null @@ -1,33 +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_gcc2_pre.conf -# ROCK Linux is Copyright (C) 1998 - 2005 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 - # 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 - hook_add preconf 3 "var_append confopt ' ' '--enable-java-gc=boehm'" - fi -fi diff --git a/package/mnemoc/boehm-gc/pkg_gcc3_pre.conf b/package/mnemoc/boehm-gc/pkg_gcc3_pre.conf deleted file mode 100644 index 604e2a05c..000000000 --- a/package/mnemoc/boehm-gc/pkg_gcc3_pre.conf +++ /dev/null @@ -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_gcc3_pre.conf -# ROCK Linux is Copyright (C) 1998 - 2005 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 diff --git a/package/mnemoc/boehm-gc/subconfig-libs.in b/package/mnemoc/boehm-gc/subconfig-libs.in deleted file mode 100644 index eda02c2bf..000000000 --- a/package/mnemoc/boehm-gc/subconfig-libs.in +++ /dev/null @@ -1,33 +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/subconfig-libs.in -# ROCK Linux is Copyright (C) 1998 - 2005 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 pkgcheck boehm-gc X -then - comment '--- Boehm-Demers-Weiser conservative garbage collector' - - pkgout - while read x; do - bool "Use it in Objective-C (${x#gcc=})" ROCKCFG_PKG_BOEHMGC_OBJC${x#gcc=gcc} 0 - bool "Use it in Java (${x#gcc=})" ROCKCFG_PKG_BOEHMGC_JAVA${x#gcc=gcc} 0 - done < <( grep '^X .* gcc=' config/$config.$swpid/packages | grep -v cross | cut -d' ' -f 5 ) - -fi