OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 02-Oct-2009 23:15:19
Branch: HEAD Handle: 2009100222151900
Modified files:
openpkg-src/db db.spec
Log:
downgrade again to DB 4.7 as 4.8 seems to require Pthread
unconditionally (not just for mutex)
Summary:
Revision Changes Path
1.93 +16 -6 openpkg-src/db/db.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/db/db.spec
============================================================================
$ cvs diff -u -r1.92 -r1.93 db.spec
--- openpkg-src/db/db.spec 20 Sep 2009 17:01:20 -0000 1.92
+++ openpkg-src/db/db.spec 2 Oct 2009 21:15:19 -0000 1.93
@@ -22,8 +22,8 @@
##
# package version
-%define V_version 4.8.24
-%define V_revision 0
+%define V_version 4.7.25
+%define V_revision 4
# package information
Name: db
@@ -36,7 +36,7 @@
Group: Database
License: BSD
Version: %{V_version}.%{V_revision}
-Release: 20090920
+Release: 20091002
# package options
%option with_pthreads no
@@ -52,6 +52,10 @@
Source0:
http://download-uk.oracle.com/berkeley-db/db-%{V_version}.tar.gz
Source1: db.pc
Patch0: db.patch
+Patch1:
http://www.oracle.com/technology/products/berkeley-db/db/update/%{V_version}/patch.%{V_version}.1
+Patch2:
http://www.oracle.com/technology/products/berkeley-db/db/update/%{V_version}/patch.%{V_version}.2
+Patch3:
http://www.oracle.com/technology/products/berkeley-db/db/update/%{V_version}/patch.%{V_version}.3
+Patch4:
http://www.oracle.com/technology/products/berkeley-db/db/update/%{V_version}/patch.%{V_version}.4
# build information
Prefix: %{l_prefix}
@@ -75,6 +79,7 @@
%track
prog db = {
+ comment = "DB 4.8 seems to require Pthread unconditionally (not
just for mutex)"
version = %{V_version}
url =
http://www.oracle.com/technology/software/products/berkeley-db/index.html
regex = Berkeley\s+DB\s+(__VER__)\s+\.tar\.gz
@@ -82,7 +87,11 @@
%prep
%setup -q -n db-%{V_version}
- %patch -p0
+ %patch -p0 -P 0
+ %patch -p0 -P 1
+ %patch -p0 -P 2
+ %patch -p0 -P 3
+ %patch -p0 -P 4
%{l_shtool} subst \
-e 's;\($(ar) cr .*\);\1 _udivdi3.o _muldi3.o _clz.o;' \
@@ -94,7 +103,7 @@
%if "%{with_pthreads}" == "yes"
mutex="POSIX/pthreads"
%else
- mutex=""
+ mutex="no"
case "%{l_platform -p}" in
amd64-* ) mutex="x86_64/gcc-assembly";;
ix86-* ) mutex="x86/gcc-assembly" ;;
@@ -102,6 +111,7 @@
sparc*-* ) mutex="Sparc/gcc-assembly" ;;
ppc*-* ) mutex="PPC/gcc-assembly" ;;
alpha*-* ) mutex="ALPHA/gcc-assembly" ;;
+ * ) mutex="UNIX/fcntl" ;;
esac
%endif
cd build_unix
@@ -125,7 +135,7 @@
--disable-cxx \
%endif
--disable-java \
- `[ ".$mutex" != . ] && echo "--with-mutex=$mutex"` \
+ --with-mutex="$mutex" \
%if "%{with_pthreads}" == "yes"
--enable-pthread_api \
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
