--- a/ChangeLog Thu Feb 19 06:13:10 2009 +0000
+++ b/ChangeLog Thu Feb 19 07:11:24 2009 +0000
@@ -1,3 +1,14 @@
+2009-02-19 Jerry Tan <[email protected]>
+
+ * SUNWw3m.spec
+ * SUNWlibgc.spec
+ * base-specs/w3m.spec
+ * base-specs/libgc.spec
+ * patches/libgc-02-rename-libbgc.diff
+ * patches/libgc-02-change-location.diff
+ * patches/w3m-02-checkgc.diff
+ move libgc to /usr/lib/libgc
+
2009-02-19 Dave Lin <[email protected]>
* include/prod.inc: Update gnome version to 2.25.91.
--- a/SUNWlibgc.spec Thu Feb 19 06:13:10 2009 +0000
+++ b/SUNWlibgc.spec Thu Feb 19 07:11:24 2009 +0000
@@ -54,7 +54,7 @@
%dir %attr (0755, root, sys) %{_datadir}
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so*
+%{_libdir}/libgc/lib*.so*
%files devel
%defattr (-, root, bin)
--- a/SUNWw3m.spec Thu Feb 19 06:13:10 2009 +0000
+++ b/SUNWw3m.spec Thu Feb 19 07:11:24 2009 +0000
@@ -47,8 +47,8 @@
gzcat %SOURCE0 | tar xf -
%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib"
+export CFLAGS="%optflags -L/usr/lib/libgc"
+export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib -L/usr/lib/libgc -R/usr/lib/libgc"
export RPM_OPT_FLAGS="$CFLAGS"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
--- a/base-specs/libgc.spec Thu Feb 19 06:13:10 2009 +0000
+++ b/base-specs/libgc.spec Thu Feb 19 07:11:24 2009 +0000
@@ -22,8 +22,9 @@
URL: http://www.hpl.hp.com/personal/Hans_Boehm/gc/
#date:2008-07-31 owner:jerrytan type:branding
Patch1: libgc-01-man.diff
-#date:2009-02-16 owner:jerrytan type:branding
-Patch2: libgc-02-rename-libbgc.diff
+#date:2009-02-19 owner:jerrytan type:branding
+Patch2: libgc-02-change-location.diff
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
Autoreqprov: on
@@ -81,6 +82,8 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/share/man/man3
cp $RPM_BUILD_ROOT/usr/share/gc/gc.man $RPM_BUILD_ROOT/usr/share/man/man3/gc.3
+mkdir -p $RPM_BUILD_ROOT/usr/lib/libgc/
+mv $RPM_BUILD_ROOT/usr/lib/lib*.so* $RPM_BUILD_ROOT/usr/lib/libgc/
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
@@ -94,9 +97,9 @@
%files
%defattr(-, root, root)
%doc README.QUICK
-%{_libdir}/libgc.so.*
-%{_libdir}/libgccpp.so.*
-%{_libdir}/libcord.so.*
+%{_libdir}/libgc/libgc.so.*
+%{_libdir}/libgc/libgccpp.so.*
+%{_libdir}/libgc/libcord.so.*
%files devel
%defattr(-, root, root)
--- a/base-specs/w3m.spec Thu Feb 19 06:13:10 2009 +0000
+++ b/base-specs/w3m.spec Thu Feb 19 07:11:24 2009 +0000
@@ -22,8 +22,6 @@
%endif
# date:2008-06-04 owner:fujiwara type:bug bugster:6710470
Patch1: w3m-01-build.diff
-# date:2009-02-16 owner:jerrytan type:branding
-Patch2: w3m-02-checkgc.diff
URL: http://w3m.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -44,7 +42,6 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
%build
%ifos linux
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libgc-02-change-location.diff Thu Feb 19 07:11:24 2009 +0000
@@ -0,0 +1,9 @@
+--- gc-7.1/bdw-gc.pc.old 2009-02-19 10:59:16.457883000 +0800
++++ gc-7.1/bdw-gc.pc 2009-02-19 10:59:38.658298000 +0800
+@@ -6,5 +6,5 @@
+ Name: Boehm-Demers-Weiser Conservative Garbage Collector
+ Description: A garbage collector for C and C++
+ Version: 7.1
+-Libs: -L${libdir} -lgc
++Libs: -L${libdir}/libgc -lgc
+ Cflags: -I${includedir}
--- a/patches/libgc-02-rename-libbgc.diff Thu Feb 19 06:13:10 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
---- gc-7.1/Makefile.am.old 2009-02-16 10:58:23.780324000 +0800
-+++ gc-7.1/Makefile.am 2009-02-16 11:01:06.462471000 +0800
-@@ -47,8 +47,8 @@
- # C Library
- # ---------
-
--lib_LTLIBRARIES += libgc.la
--libgc_la_SOURCES = \
-+lib_LTLIBRARIES += libbgc.la
-+libbgc_la_SOURCES = \
- allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
- dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
- malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
-@@ -60,32 +60,32 @@
- # ---------------------------------
-
- if PTHREADS
--libgc_la_SOURCES += pthread_support.c pthread_stop_world.c
-+libbgc_la_SOURCES += pthread_support.c pthread_stop_world.c
- endif
-
- if DARWIN_THREADS
--libgc_la_SOURCES += darwin_stop_world.c
-+libbgc_la_SOURCES += darwin_stop_world.c
- endif
-
- if WIN32_THREADS
--libgc_la_SOURCES += win32_threads.c
-+libbgc_la_SOURCES += win32_threads.c
- endif
-
- if USE_INTERNAL_LIBATOMIC_OPS
--nodist_libgc_la_SOURCES = ./atomic_ops.c
-+nodist_libbgc_la_SOURCES = ./atomic_ops.c
- endif
-
- if NEED_ATOMIC_OPS_ASM
--nodist_libgc_la_SOURCES = ./atomic_ops_sysdeps.S
-+nodist_libbgc_la_SOURCES = ./atomic_ops_sysdeps.S
- endif
-
- # Include THREADDLLIBS here to ensure that the correct versions of
- # linuxthread semaphore functions get linked:
--libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
--libgc_la_DEPENDENCIES = @addobjs@
--libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
-+libbgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS)
-+libbgc_la_DEPENDENCIES = @addobjs@
-+libbgc_la_LDFLAGS = $(extra_ldflags_libbgc) -version-info 1:3:0 -no-undefined
-
--EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
-+EXTRA_libbgc_la_SOURCES = alpha_mach_dep.S \
- mips_sgi_mach_dep.s mips_ultrix_mach_dep.s \
- rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
- sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
-@@ -95,11 +95,11 @@
- # -------------
-
- if CPLUSPLUS
--lib_LTLIBRARIES += libgccpp.la
-+lib_LTLIBRARIES += libbgccpp.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
-+libbgccpp_la_SOURCES = gc_cpp.cc
-+libbgccpp_la_LIBADD = ./libbgc.la
-+libbgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
- endif
-
- # FIXME: If Visual C++ users use Makefile.am, this should go into
-@@ -116,7 +116,7 @@
-
- ## FIXME: relies on internal code generated by automake.
- ## FIXME: ./configure --enable-dependency-tracking should be used
--#all_objs = @addobjs@ $(libgc_la_OBJECTS)
-+#all_objs = @addobjs@ $(libbgc_la_OBJECTS)
- #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
- #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
- #include/gc_pthread_redirects.h include/gc_config_macros.h \
-@@ -200,7 +200,7 @@
- include cord/cord.am
- include tests/tests.am
- include doc/doc.am
--# Putting these at the top causes cord to be built first, and not find libgc.a
-+# Putting these at the top causes cord to be built first, and not find libbgc.a
- # on HP/UX. There may be a better fix.
-
-
---- gc-7.1/configure.ac.old Mon Feb 16 11:03:39 2009
-+++ gc-7.1/configure.ac Mon Feb 16 11:16:34 2009
-@@ -312,14 +312,14 @@
- # extra LD Flags which are required for targets
- case "${host}" in
- *-*-darwin*)
-- extra_ldflags_libgc=-Wl,-single_module
-+ extra_ldflags_libbgc=-Wl,-single_module
- ;;
- esac
--AC_SUBST(extra_ldflags_libgc)
-+AC_SUBST(extra_ldflags_libbgc)
-
- AC_SUBST(EXTRA_TEST_LIBS)
-
--target_all=libgc.la
-+target_all=libbgc.la
- AC_SUBST(target_all)
-
- dnl If the target is an eCos system, use the appropriate eCos
---- gc-7.1/cord/cord.am.old 2009-02-16 13:24:33.828848000 +0800
-+++ gc-7.1/cord/cord.am 2009-02-16 13:24:51.101815000 +0800
-@@ -1,7 +1,7 @@
-
- lib_LTLIBRARIES += libcord.la
-
--libcord_la_LIBADD = $(top_builddir)/libgc.la
-+libcord_la_LIBADD = $(top_builddir)/libbgc.la
- libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined
-
- libcord_la_SOURCES = \
---- gc-7.1/bdw-gc.pc.in.old Mon Feb 16 14:03:53 2009
-+++ gc-7.1/bdw-gc.pc.in Mon Feb 16 14:04:11 2009
-@@ -6,5 +6,5 @@
- Name: Boehm-Demers-Weiser Conservative Garbage Collector
- Description: A garbage collector for C and C++
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lgc
-+Libs: -L${libdir} -lbgc
- Cflags: -I${includedir}
--- a/patches/w3m-02-checkgc.diff Thu Feb 19 06:13:10 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
---- w3m-0.5.2/aclocal.m4.old 2009-02-16 15:39:51.608767000 +0800
-+++ w3m-0.5.2/aclocal.m4 2009-02-16 15:41:27.651144000 +0800
-@@ -457,7 +457,7 @@
- fi
- fi
- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBGC="-lgc"])
-+ AC_CHECK_LIB(bgc, GC_init, [LIBGC="`pkg-config --libs bdw-gc`"])
- if test x"$ac_cv_lib_gc_GC_init" = xno; then
- AC_MSG_CHECKING(GC library location)
- AC_MSG_RESULT($with_gc)
-@@ -467,7 +467,7 @@
- LDFLAGS="$LDFLAGS -L$dir/lib"
- AC_MSG_CHECKING($dir)
- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib -lgc"; break])
-+ AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBGC="-L$dir/lib `pkg-config --libs bdw-gc`"; break])
- LDFLAGS="$ldflags"
- done
- if test x"$gclibdir" = xno; then
---- w3m-0.5.2/acinclude.m4.old 2009-02-16 15:46:21.447114000 +0800
-+++ w3m-0.5.2/acinclude.m4 2009-02-16 15:47:32.833010000 +0800
-@@ -456,7 +456,7 @@
- fi
- fi
- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [LIBS="$LIBS -lgc"])
-+ AC_CHECK_LIB(bgc, GC_init, [LIBS="$LIBS `pkg-config --libs bdw-gc`"])
- if test x"$ac_cv_lib_gc_GC_init" = xno; then
- AC_MSG_CHECKING(GC library location)
- AC_MSG_RESULT($with_gc)
-@@ -466,7 +466,7 @@
- LDFLAGS="$LDFLAGS -L$dir/lib"
- AC_MSG_CHECKING($dir)
- unset ac_cv_lib_gc_GC_init
-- AC_CHECK_LIB(gc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
-+ AC_CHECK_LIB(bgc, GC_init, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib `pkg-config --libs bdw-gc`"; break])
- LDFLAGS="$ldflags"
- done
- if test x"$gclibdir" = xno; then