OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Sep-2006 21:04:51
Branch: HEAD Handle: 2006091820045100
Modified files:
openpkg-src/subversion subversion.spec
Log:
fix building under Solaris by using the new Berkeley-DB pkg-config
information and by workarounding /bin/ksh libtool issues by using GNU
bash
Summary:
Revision Changes Path
1.111 +7 -5 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.110 -r1.111 subversion.spec
--- openpkg-src/subversion/subversion.spec 12 Sep 2006 17:47:30 -0000
1.110
+++ openpkg-src/subversion/subversion.spec 18 Sep 2006 19:04:51 -0000
1.111
@@ -41,7 +41,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20060912
+Release: 20060918
# package options
%option with_cvs2svn no
@@ -65,10 +65,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, make, libtool, sed
+BuildPreReq: OpenPKG, openpkg >= 20060823, make, libtool, sed, pkgconfig
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: diffutils, libxml, db, openssl, zlib
-PreReq: diffutils, libxml, db, openssl, zlib
+BuildPreReq: diffutils, libxml, db >= 4.4.20.4-20060918, openssl, zlib
+PreReq: diffutils, libxml, db >= 4.4.20.4-20060918, openssl, zlib
%if "%{with_cvs2svn}" == "yes"
PreReq: rcs, python, python::with_dbm = yes
%endif
@@ -151,7 +151,9 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags libxml2 .}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} `pkg-config db --libs-only-L`" \
+ LIBS="`pkg-config db --libs-only-l`" \
+ CONFIG_SHELL="%{l_bash}" \
./configure \
--prefix=%{l_prefix} \
--with-berkeley-db=%{l_prefix} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
