Forráskód Böngészése

link against external PCRE

Ralf S. Engelschall 18 éve
szülő
commit
f3a166ca4e
2 módosított fájl, 14 hozzáadás és 2 törlés
  1. 11 0
      monotone/monotone.patch
  2. 3 2
      monotone/monotone.spec

+ 11 - 0
monotone/monotone.patch

@@ -10,3 +10,14 @@ Index: configure
         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
+ 

+ 3 - 2
monotone/monotone.spec

@@ -53,8 +53,8 @@ Prefix:       %{l_prefix}
 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 @@ AutoReqProv:  no
         --infodir=%{l_prefix}/info \
         --mandir=%{l_prefix}/man \
         --enable-static-boost=%{l_prefix} \
+        --with-system-pcre \
         --disable-nls
 
     #   build program