diff --git a/configure.patch b/configure.patch deleted file mode 100644 index 7aefc56..0000000 --- a/configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure -+++ configure -@@ -4814,7 +4814,7 @@ - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; -@@ -7801,7 +7801,7 @@ - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - version_type=linux - need_lib_prefix=no - need_version=no diff --git a/gc-7.2alpha6.tar.bz2 b/gc-7.2alpha6.tar.bz2 new file mode 100644 index 0000000..582ebab --- /dev/null +++ b/gc-7.2alpha6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d62742cdb32a8f9ca2a8ede3511f1b019ca3c663240ef2fd513ffd3a058dbd2 +size 1011054 diff --git a/gc-build.patch b/gc-build.patch new file mode 100644 index 0000000..d654666 --- /dev/null +++ b/gc-build.patch @@ -0,0 +1,12 @@ +Index: gc-7.2alpha6/Makefile.am +=================================================================== +--- gc-7.2alpha6.orig/Makefile.am ++++ gc-7.2alpha6/Makefile.am +@@ -104,7 +104,6 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep. + + if CPLUSPLUS + lib_LTLIBRARIES += libgccpp.la +-pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h + libgccpp_la_SOURCES = gc_cpp.cc + libgccpp_la_LIBADD = ./libgc.la + libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined diff --git a/gc.atomic-locks.patch b/gc.atomic-locks.patch deleted file mode 100644 index 7f1e39c..0000000 --- a/gc.atomic-locks.patch +++ /dev/null @@ -1,36 +0,0 @@ -Use gcc build-in atomic functions, -the selfmade versions will not work on powerpc - ---- - include/private/gc_locks.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/include/private/gc_locks.h -+++ b/include/private/gc_locks.h -@@ -88,6 +88,18 @@ - /* acquisition and release. We need this for correct operation of the */ - /* incremental GC. */ - # ifdef __GNUC__ -+#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 -+static inline int GC_test_and_set(volatile unsigned int *addr) -+{ -+#define GC_TEST_AND_SET_DEFINED -+ return (int)__sync_lock_test_and_set(addr, 1); -+} -+static inline void GC_clear(volatile unsigned int *addr) -+{ -+#define GC_CLEAR_DEFINED -+ __sync_lock_test_and_set(addr, 0); -+} -+#else /* ! __GNUC__ 4.1+ */ - # if defined(I386) - inline static int GC_test_and_set(volatile unsigned int *addr) { - int oldval; -@@ -288,6 +300,7 @@ - return ret; - } - # endif -+# endif /* !__GNUC__ 4.1+ */ - # endif /* __GNUC__ */ - # if (defined(ALPHA) && !defined(__GNUC__)) - # ifndef OSF1 diff --git a/gc.changes b/gc.changes index 020658b..1fd8d57 100644 --- a/gc.changes +++ b/gc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 20 15:08:02 UTC 2011 - pgajdos@novell.com + +- updated to 7.2alpha6 + * many bug fixes and new features from 6.6, see doc/README.changes + for older changes and ChangeLog for recent changes + ------------------------------------------------------------------- Thu Apr 2 15:40:11 CEST 2009 - crrodriguez@suse.de diff --git a/gc.spec b/gc.spec index 11c34c8..694c8d2 100644 --- a/gc.spec +++ b/gc.spec @@ -19,7 +19,8 @@ Name: gc -Version: 6.6 +Version: 7.1.9.6 +%define src_ver 7.2alpha6 Release: 138 AutoReqProv: on # bug437293 @@ -31,13 +32,10 @@ Group: Development/Libraries/C and C++ License: BSD 3-Clause Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ Summary: A garbage collector for C and C++ -Source: %{name}%{version}.tar.bz2 -#Patch: %{name}-%{version}-shared.diff +Source: %{name}-%{src_ver}.tar.bz2 +Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ -Patch: gcc4.patch -Patch1: configure.patch -Patch2: gc.atomic-locks.patch %description The Boehm-Demers-Weiser conservative garbage collector can be used as a @@ -78,15 +76,13 @@ Authors: Alan J. Demers %prep -%setup -q -n %name%version -%patch -%patch1 -%patch2 -p1 +%setup -q -n %{name}-%{src_ver} +%patch0 -p1 %build -#%{suse_update_config -f} -#autoreconf -fi -#%{__libtoolize} -f +%{suse_update_config -f} +autoreconf -fi +%{__libtoolize} -f %configure --disable-static --with-pic --enable-cplusplus %{__make} %{?jobs:-j%jobs} @@ -114,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc doc/[a-z]* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc %{_includedir}/* %changelog diff --git a/gc6.6.tar.bz2 b/gc6.6.tar.bz2 deleted file mode 100644 index bfeb493..0000000 --- a/gc6.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18bf5196a16a6cc198755f81afc8e9167c09a36b90077574e8581ff1d07d0e78 -size 588635 diff --git a/gcc4.patch b/gcc4.patch deleted file mode 100644 index fa970f7..0000000 --- a/gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/gc_cpp.h -+++ include/gc_cpp.h -@@ -180,7 +180,7 @@ - inline void* operator new[]( size_t size, void *p ); - inline void operator delete[]( void* obj ); - # ifdef GC_PLACEMENT_DELETE -- inline void gc::operator delete[]( void*, void* ); -+ inline void operator delete[]( void*, void* ); - # endif - #endif /* GC_OPERATOR_NEW_ARRAY */ - }; diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4