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: 23-Jun-2007 15:20:43
Branch: HEAD Handle: 2007062314204300
Modified files:
openpkg-src/apr apr.spec
Log:
explicitly disable iconv support if not requested (we have to use
config.cache as --without-iconv is not supported correctly) in order
to avoid build failures for Apache. Reason: if iconv is not requested,
but libiconv is installed in instance and as present in the system
libc (e.g. Linux glibc), then APR would find that iconv is usable
(without even linking against -liconv) but unfortunately this fails
because it will pick up the instance iconv.h which maps iconv_xxx to
libiconv_xxx
Summary:
Revision Changes Path
1.47 +7 -1 openpkg-src/apr/apr.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apr/apr.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 apr.spec
--- openpkg-src/apr/apr.spec 22 Jun 2007 21:25:13 -0000 1.46
+++ openpkg-src/apr/apr.spec 23 Jun 2007 13:20:43 -0000 1.47
@@ -37,7 +37,7 @@
Group: Libraries
License: Apache
Version: %{V_apr}
-Release: 20070622
+Release: 20070623
# package options
%option with_threads no
@@ -118,12 +118,18 @@
%{l_make} %{l_mflags -O}
) || exit $?
( cd apr-util-%{V_apr_util}
+ cp /dev/null config.cache
+%if "%{with_iconv}" == "no"
+ ( echo "ac_cv_header_iconv_h=no"
+ ) >config.cache
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
%if "%{with_ldap}" == "yes"
LIBS="-lssl -lcrypto" \
%endif
./configure \
+ --cache-file=./config.cache \
--enable-layout=GNU \
--prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/apr \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
