Browse Source
Alejandro Mery <amery@geeks.cl>:
use of pkg_*_pre.conf instead of parse-config
and options to build gcc{2,3,3.3} objc with gc, and options to build their java wth system boehms instead of the old included version.
and makes it not install doc itself
testes finished for gcc2 and gcc33... test for gcc3 still in progress but looks good.
git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1304 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
12 changed files with 255 additions and 24 deletions
Split View
Diff Options
-
+1 -0Documentation/Developers/CHANGELOG-RENE
-
+0 -1package/mnemoc/boehm-gc/TODO
-
+5 -0package/mnemoc/boehm-gc/boehm-gc.conf
-
+123 -0package/mnemoc/boehm-gc/gcc3-use_system_gc.diff
-
+1 -1package/mnemoc/boehm-gc/gcc33-use_system_gc.diff
-
+40 -0package/mnemoc/boehm-gc/install_private_headers.diff
-
+3 -0package/mnemoc/boehm-gc/install_private_headers.in
-
+11 -0package/mnemoc/boehm-gc/no_doc.patch
-
+33 -0package/mnemoc/boehm-gc/pkg_gcc2_pre.conf
-
+12 -19package/mnemoc/boehm-gc/pkg_gcc33_pre.conf
-
+23 -0package/mnemoc/boehm-gc/pkg_gcc3_pre.conf
-
+3 -3package/mnemoc/boehm-gc/subconfig-libs.in
@ -1 +0,0 @@ |
|||
- patch to build libjava against system gc. |
|||
@ -0,0 +1,5 @@ |
|||
if [ "$ROCKCFG_PKG_BOEHMGC_JAVA3" == "1" -o "$ROCKCFG_PKG_BOEHMGC_JAVA33" == "1" ]; then |
|||
var_append patchfiles ' ' $confdir/install_private_headers.diff |
|||
# this files should be flistdeleted because are not wanted on final systems |
|||
. $confdir/install_private_headers.in |
|||
fi |
|||
@ -0,0 +1,123 @@ |
|||
# --- 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 - 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-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 |
|||
@ -0,0 +1,40 @@ |
|||
--- ./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: |
|||
@ -0,0 +1,3 @@ |
|||
flistdel="$flistdel|$prefix/include/gc/private/.*" |
|||
flistdel="$flistdel|$prefix/include/gc/(cord\.h|ec\.h|javaxfc\.h)" |
|||
|
|||
@ -0,0 +1,11 @@ |
|||
--- ./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 |
|||
@ -0,0 +1,33 @@ |
|||
# --- 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/parse-config |
|||
# 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 |
|||
# 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 |
|||
@ -0,0 +1,23 @@ |
|||
# --- 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/parse-config |
|||
# 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 --- |
|||
|
|||
. $base/package/mnemoc/boehm-gc/pkg_gcc33_pre.conf |
|||