--- db4.spec.fcs 2003-10-24 16:32:05.000000000 -0400 +++ db4.spec 2003-12-17 17:24:00.000000000 -0500 @@ -1,7 +1,9 @@ %define java_arches %{ix86} alpha ia64 ppc s390 s390x sparc x86_64 -%define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64 +# %define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64 +%define nptl_arches none # define nptl_java_arches to be the intersection of java_arches and nptl_arches -%define nptl_java_arches %{ix86} ia64 ppc s390 s390x x86_64 +#%define nptl_java_arches %{ix86} ia64 ppc s390 s390x x86_64 +%define nptl_java_arches none # compatibility with legacy versions of rpm %{!?_lib:%define _lib lib} @@ -13,7 +15,7 @@ Summary: The Berkeley DB database library (version 4) for C. Name: db4 Version: 4.1.25 -Release: 14 +Release: 14_nonptl Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz Source2: nptl-abi-note.S @@ -141,7 +143,7 @@ } set +x # XXX painful to watch -# Fix all of the HTML files. +echo Fixing the HTML hrefs... fixup_href `find . -name "*.html"` set -x # XXX painful to watch @@ -162,11 +164,11 @@ pushd dist/$1 # Force the threading model used, for selecting whether or not we will # depend on NPTL-specific features. - echo ${2:+db_cv_mutex=$2} > config.cache - if test -n "$nptl_lo" ; then - /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS \ - -o $nptl_lo -c $nptl_s - fi +# echo ${2:+db_cv_mutex=$2} > config.cache +# if test -n "$nptl_lo" ; then +# /bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS \ +# -o $nptl_lo -c $nptl_s +# fi ln -sf ../configure . # XXX --enable-diagnostic should be disabled for production (but is # useful). @@ -341,6 +343,9 @@ %endif %changelog +* Wed Dec 17 2003 Chris Schanzle 4.1.25-14_nonptl +- disabled nptl from build for all arches + * Fri Oct 24 2003 Nalin Dahyabhai 4.1.25-14 - symlink from %%{_libdir}/tls/libdb-4.1.so to the copy in /%%{_lib}/tls, so that the run-time linker can find the right copy for of apps which use an