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: 26-Oct-2007 15:26:29
Branch: HEAD Handle: 2007102614262900
Modified files:
openpkg-src/monotone monotone.patch monotone.spec
Log:
link against external PCRE
Summary:
Revision Changes Path
1.10 +11 -0 openpkg-src/monotone/monotone.patch
1.23 +3 -2 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 monotone.patch
--- openpkg-src/monotone/monotone.patch 26 Oct 2007 09:19:23 -0000
1.9
+++ openpkg-src/monotone/monotone.patch 26 Oct 2007 13:26:29 -0000
1.10
@@ -10,3 +10,14 @@
found_libpcre=yes
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
+Index: pcrewrap.cc
+--- pcrewrap.cc.orig 2007-10-26 00:40:22 +0200
++++ pcrewrap.cc 2007-10-26 15:19:23 +0200
+@@ -15,7 +15,6 @@
+ // This dirty trick is necessary to prevent the 'pcre' typedef defined by
+ // pcre.h from colliding with namespace pcre.
+ #define pcre pcre_t
+-#include "pcre_config.h"
+ #include "pcre.h"
+ #undef pcre
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.22 -r1.23 monotone.spec
--- openpkg-src/monotone/monotone.spec 26 Oct 2007 07:42:05 -0000
1.22
+++ openpkg-src/monotone/monotone.spec 26 Oct 2007 13:26:29 -0000
1.23
@@ -53,8 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes
PreReq: OpenPKG, openpkg >= 20040130, apg, diffutils, perl, perl-mail,
perl-term, less
-BuildPreReq: boost, zlib
-PreReq: boost, zlib
+BuildPreReq: boost, zlib, pcre
+PreReq: boost, zlib, pcre
AutoReq: no
AutoReqProv: no
@@ -100,6 +100,7 @@
--infodir=%{l_prefix}/info \
--mandir=%{l_prefix}/man \
--enable-static-boost=%{l_prefix} \
+ --with-system-pcre \
--disable-nls
# build program
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
