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: 07-Jul-2005 10:28:03
Branch: HEAD Handle: 2005070709280200
Modified files:
openpkg-src/gcc gcc.spec
Log:
use external zlib if we build gcc with Java support
Summary:
Revision Changes Path
1.110 +12 -1 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.109 -r1.110 gcc.spec
--- openpkg-src/gcc/gcc.spec 20 May 2005 07:41:46 -0000 1.109
+++ openpkg-src/gcc/gcc.spec 7 Jul 2005 08:28:02 -0000 1.110
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20050520
+Release: 20050707
# package options
%option with_cxx yes
@@ -63,6 +63,10 @@
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
%endif
+%if "%{with_java}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
AutoReq: no
AutoReqProv: no
%if "%{with_gcc}" == "yes"
@@ -146,6 +150,10 @@
# configure the package
CC="%{l_cc}" \
CFLAGS="%{l_cflags}" \
+%if "%{with_java}" == "yes"
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+%endif
CONFIG_SHELL="%{l_bash}" \
../configure \
--cache-file=./config.cache \
@@ -161,6 +169,9 @@
--disable-maintainer-mode \
--disable-shared \
--disable-nls \
+%if "%{with_java}" == "yes"
+ --with-system-zlib \
+%endif
${l_with_gnu_ld_as}
# explicitly redirect remaining gcc library directories
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
