auto-import gc-6.4-2 on branch devel from gc-6.4-2.src.rpm
This commit is contained in:
parent
8a2381ffd4
commit
c76af5d512
@ -1 +1 @@
|
||||
gc6.3.tar.gz
|
||||
gc6.4.tar.gz
|
||||
|
@ -1,64 +0,0 @@
|
||||
--- gc6.3alpha6/Makefile.am.opendl 2004-05-05 17:07:40.000000000 -0500
|
||||
+++ gc6.3alpha6/Makefile.am 2004-06-01 09:27:38.654853438 -0500
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
# Include THREADLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
-libgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
|
||||
+libgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgc_la_DEPENDENCIES = @addobjs@
|
||||
libgc_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
|
||||
libgccpp_la_SOURCES = gc_cpp.cc
|
||||
-libgccpp_la_LIBADD = $(THREADLIBS) $(UNWINDLIBS)
|
||||
+libgccpp_la_LIBADD = $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
|
||||
@@ -91,9 +91,9 @@
|
||||
## are included in the distribution
|
||||
# gctest_OBJECTS = test.o
|
||||
gctest_SOURCES = tests/test.c
|
||||
-gctest_LDADD = ./libgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+gctest_LDADD = ./libgc.la
|
||||
test_cpp_SOURCES = tests/test_cpp.cc
|
||||
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
||||
|
||||
TESTS = gctest $(extra_checks)
|
||||
|
||||
--- gc6.3alpha6/Makefile.in.opendl 2004-05-05 17:08:00.000000000 -0500
|
||||
+++ gc6.3alpha6/Makefile.in 2004-06-01 09:28:27.608833775 -0500
|
||||
@@ -188,7 +188,7 @@
|
||||
|
||||
# Include THREADLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
-libgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
|
||||
+libgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgc_la_DEPENDENCIES = @addobjs@
|
||||
libgc_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
|
||||
|
||||
libgccpp_la_SOURCES = gc_cpp.cc
|
||||
-libgccpp_la_LIBADD = $(THREADLIBS) $(UNWINDLIBS)
|
||||
+libgccpp_la_LIBADD = $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
AM_CXXFLAGS = @GC_CFLAGS@
|
||||
@@ -212,9 +212,9 @@
|
||||
|
||||
# gctest_OBJECTS = test.o
|
||||
gctest_SOURCES = tests/test.c
|
||||
-gctest_LDADD = ./libgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+gctest_LDADD = ./libgc.la
|
||||
test_cpp_SOURCES = tests/test_cpp.cc
|
||||
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
||||
|
||||
TESTS = gctest $(extra_checks)
|
||||
|
31
gc.spec
31
gc.spec
@ -1,22 +1,20 @@
|
||||
# $Id: gc.spec,v 1.5 2004/12/10 22:03:02 mschwendt Exp $
|
||||
|
||||
# define to --enable-threads, --enable-parallel-mark
|
||||
%define threads 1
|
||||
|
||||
#define beta alpha6
|
||||
# $Id: gc.spec,v 1.6 2005/01/29 16:28:30 mschwendt Exp $
|
||||
|
||||
Summary: C++ Garbage Collector
|
||||
Name: gc
|
||||
Epoch: 0
|
||||
Version: 6.3
|
||||
Release: 1%{?dist_tag}
|
||||
Version: 6.4
|
||||
# For Extras
|
||||
Release: 2
|
||||
# For kde-redhat
|
||||
#Release: 0.2%{?dist_tag}.kde
|
||||
Group: System Environment/Libraries
|
||||
License: BSD
|
||||
Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/
|
||||
Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.3.tar.gz
|
||||
Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
Patch1: gc-6.3-opendl.patch
|
||||
Patch1: gc6.4-opendl.patch
|
||||
|
||||
|
||||
%description
|
||||
@ -42,7 +40,10 @@ Libraries and header files for gc development.
|
||||
%configure \
|
||||
--disable-static \
|
||||
--enable-cplusplus \
|
||||
%{?threads: --enable-threads=posix --enable-parallel-mark}
|
||||
--enable-threads=posix \
|
||||
%ifarch %{ix86}
|
||||
--enable-parallel-mark
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -84,6 +85,14 @@ rm -rf "$RPM_BUILD_ROOT"
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:6.4-2
|
||||
- --enable-threads unconditionally
|
||||
- --enable-parallel-mark only on %%ix86 (#144681)
|
||||
|
||||
* Mon Jan 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:6.4-1
|
||||
- 6.4
|
||||
- update opendl patch
|
||||
|
||||
* Fri Jul 09 2004 Rex Dieter <rexdieter at sf.net> 0:6.3-0.fdr.1
|
||||
- 6.3(final)
|
||||
|
||||
|
64
gc6.4-opendl.patch
Normal file
64
gc6.4-opendl.patch
Normal file
@ -0,0 +1,64 @@
|
||||
--- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600
|
||||
+++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
# Include THREADDLLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
|
||||
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgc_la_DEPENDENCIES = @addobjs@
|
||||
libgc_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
|
||||
|
||||
libgccpp_la_SOURCES = gc_cpp.cc
|
||||
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
|
||||
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
|
||||
@@ -91,9 +91,9 @@
|
||||
## are included in the distribution
|
||||
# gctest_OBJECTS = test.o
|
||||
gctest_SOURCES = tests/test.c
|
||||
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+gctest_LDADD = ./libgc.la
|
||||
test_cpp_SOURCES = tests/test_cpp.cc
|
||||
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
||||
|
||||
TESTS = gctest $(extra_checks)
|
||||
|
||||
--- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600
|
||||
+++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600
|
||||
@@ -188,7 +188,7 @@
|
||||
|
||||
# Include THREADDLLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
|
||||
+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgc_la_DEPENDENCIES = @addobjs@
|
||||
libgc_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
|
||||
|
||||
libgccpp_la_SOURCES = gc_cpp.cc
|
||||
-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS)
|
||||
+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
libgccpp_la_LDFLAGS = -version-info 1:2:0
|
||||
|
||||
AM_CXXFLAGS = @GC_CFLAGS@
|
||||
@@ -212,9 +212,9 @@
|
||||
|
||||
# gctest_OBJECTS = test.o
|
||||
gctest_SOURCES = tests/test.c
|
||||
-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+gctest_LDADD = ./libgc.la
|
||||
test_cpp_SOURCES = tests/test_cpp.cc
|
||||
-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS)
|
||||
+test_cpp_LDADD = ./libgc.la ./libgccpp.la
|
||||
|
||||
TESTS = gctest $(extra_checks)
|
||||
|
Loading…
Reference in New Issue
Block a user