OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Feb-2004 12:42:36
Branch: HEAD Handle: 2004021211423600
Modified files:
openpkg-src/tinyproxy tinyproxy.spec
Log:
use PCRE to workaround broken regex library under Solaris 8 and
because PCRE is cool anyway
Summary:
Revision Changes Path
1.7 +11 -3 openpkg-src/tinyproxy/tinyproxy.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tinyproxy/tinyproxy.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 tinyproxy.spec
--- openpkg-src/tinyproxy/tinyproxy.spec 7 Feb 2004 17:59:21 -0000 1.6
+++ openpkg-src/tinyproxy/tinyproxy.spec 12 Feb 2004 11:42:36 -0000 1.7
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 1.7.0
-Release: 20040207
+Release: 20040212
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/tinyproxy/tinyproxy-%{version}.tar.gz
@@ -45,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, openssl, flex, bison
-PreReq: OpenPKG, openpkg >= 20040130, openssl
+BuildPreReq: OpenPKG, openpkg >= 20040130, openssl, pcre, flex, bison
+PreReq: OpenPKG, openpkg >= 20040130, openssl, pcre
AutoReq: no
AutoReqProv: no
@@ -71,12 +71,20 @@
rm -f src/grammar.c
rm -f src/scanner.c
+ # enforce use of PCRE
+ # (mainly to work-around problems with system libraries)
+ %{l_shtool} subst \
+ -e 's;regex\.h;pcreposix.h;g' \
+ -e 's;REGEX_H;PCREPOSIX_H;g' \
+ config.h.in configure src/common.h
+
%build
# configure program
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
+ LIBS="-lpcreposix -lpcre" \
./configure \
--prefix=%{l_prefix} \
--with-config=%{l_prefix}/etc/tinyproxy/tinyproxy.conf \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
