Browse Source

sync with other packages

master
parent
commit
d7f4af8df6
  1. 26
      gcc43/gcc43.spec

26
gcc43/gcc43.spec

@ -21,8 +21,6 @@
## SUCH DAMAGE.
##
# FIXME: rse: with_cxx=yes still broken because tries to partly unconditionally include <iconv.h>
# package version
%define V_full 4.3.5
%define V_comp 43
@ -38,11 +36,11 @@ Class: EVAL
Group: Compiler
License: GPL
Version: %{V_full}
Release: 20100523
Release: 20100801
# package options
%option with_binutils yes
%option with_cxx no
%option with_cxx yes
%option with_objc no
%option with_java no
%option with_fortran no
@ -65,6 +63,10 @@ PreReq: binutils >= 2.14
%endif
BuildPreReq: mpfr, gmp
PreReq: mpfr, gmp
%if "%{with_cxx}" == "yes"
BuildPreReq: libiconv
PreReq: libiconv
%endif
%if "%{with_java}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@ -105,6 +107,9 @@ Provides: gcc = %{version}-%{release}
libstdc++-v3/configure
;;
esac
%{l_shtool} subst \
-e 's;<iconv\.h>;"%{l_prefix}/include/iconv.h";' \
libstdc++-v3/include/ext/codecvt_specializations.h
%build
# create build sub-directory
@ -152,7 +157,7 @@ Provides: gcc = %{version}-%{release}
# 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
@ -164,6 +169,8 @@ Provides: gcc = %{version}-%{release}
--srcdir=`pwd`/.. \
--prefix=%{l_prefix} \
--exec-prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--infodir=%{l_prefix}/info \
--includedir=%{l_prefix}/include/gcc%{V_comp} \
--libexecdir=%{l_prefix}/libexec/gcc%{V_comp} \
--with-gxx-include-dir=%{l_prefix}/include/g++%{V_comp} \
@ -180,6 +187,9 @@ Provides: gcc = %{version}-%{release}
--enable-multilib \
%else
--disable-multilib \
%endif
%if "%{with_cxx}" == "yes"
--with-libiconv-prefix=%{l_prefix} \
%endif
--with-gmp=%{l_prefix} \
--with-mpfr=%{l_prefix} \
@ -232,6 +242,12 @@ Provides: gcc = %{version}-%{release}
ia64-* ) l_cflags="$l_cflags -fPIC"; l_cxxflags="$l_cxxflags -fPIC" ;;
sparc64-freebsd* ) l_cflags="$l_cflags -fPIC"; l_cxxflags="$l_cxxflags -fPIC" ;;
esac
%if "%{with_java}" == "yes" || "%{with_fortran}" == "yes" || "%{with_cxx}" == "yes"
l_cflags="$l_cflags %{l_cppflags}"
l_cxxflags="$l_cxxflags %{l_cppflags}"
l_libcflags="$l_libcflags %{l_cppflags}"
l_libcxxflags="$l_libcxxflags %{l_cppflags}"
%endif
# build the package
MAKE="%{l_make} %{l_mflags}" \

Loading…
Cancel
Save