OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Feb-2009 22:17:28
Branch: HEAD Handle: 2009020721172800
Modified files:
openpkg-src/gcc44 gcc44.spec
Log:
upgrading package: gcc44 4.4s20090123 -> 4.4s20090206
Summary:
Revision Changes Path
1.31 +10 -6 openpkg-src/gcc44/gcc44.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc44/gcc44.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 gcc44.spec
--- openpkg-src/gcc44/gcc44.spec 24 Jan 2009 12:22:35 -0000 1.30
+++ openpkg-src/gcc44/gcc44.spec 7 Feb 2009 21:17:28 -0000 1.31
@@ -23,12 +23,11 @@
# FIXME: rse: GCC since 4.3 now officially and unconditionally requires
gmp/mpfr!
# FIXME: rse: This requires blessing "gmp" and "mpfr" to CORE or include
copies into "gcc"
-# FIXME: rse: with_cxx=yes still broken because tries to partly
unconditionally include <iconv.h>
# package version
%define V_full 4.4
%define V_comp 44
-%define V_snap 20090123
+%define V_snap 20090206
# package information
Name: gcc44
@@ -41,7 +40,7 @@
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
-Release: 20090124
+Release: 20090207
# package options
%option with_binutils yes
@@ -68,10 +67,12 @@
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
%endif
-# %if "%{with_fortran}" == "yes"
BuildPreReq: mpfr, gmp
PreReq: mpfr, gmp
-# %endif
+%if "%{with_cxx}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
%if "%{with_java}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@@ -161,7 +162,7 @@
# configure the package
CC="%{l_cc}" \
CFLAGS="%{l_cflags}" \
-%if "%{with_java}" == "yes" || "%{with_fortran}" == "yes"
+%if "%{with_java}" == "yes" || "%{with_fortran}" == "yes" || "%{with_cxx}"
== "yes"
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
%endif
@@ -190,6 +191,9 @@
%else
--disable-multilib \
%endif
+%if "%{with_cxx}" == "yes"
+ --with-libiconv-prefix=%{l_prefix} \
+%endif
--with-gmp=%{l_prefix} \
--with-mpfr=%{l_prefix} \
${l_with_gnu_ld_as}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
