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: 14-Nov-2006 13:07:38
Branch: HEAD Handle: 2006111412073800
Modified files:
openpkg-src/gcc gcc.spec
Log:
The GCC "multilib" feature is a problematic one as not all platforms
where GCC thinks it can support multilib really provide all
prerequisites for this. GCC usually thinks that amd64-linux platforms
support "multilib" (32 and 64 bit at the same time), but with mostly
all default installations this isn't the case. Similar to other
platforms like ix86-solaris. So, instead of letting GCC enable
multilib with its own decision, make the "multilib" feature an
explicit one and actually _disable_ it by default (as within OpenPKG
we don't want mix and actually cannot mix 32 and 64 bit code anyway).
If one really wishes "multilib" with OpenPKG's GCC one now explicitly
have to enable it with the "with_multilib" option.
Summary:
Revision Changes Path
1.132 +8 -11 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.131 -r1.132 gcc.spec
--- openpkg-src/gcc/gcc.spec 13 Nov 2006 21:51:01 -0000 1.131
+++ openpkg-src/gcc/gcc.spec 14 Nov 2006 12:07:38 -0000 1.132
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20061113
+Release: 20061114
# package options
%option with_cxx yes
@@ -48,6 +48,7 @@
%option with_profile no
%option with_binutils yes
%option with_threads yes
+%option with_multilib no
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
@@ -119,7 +120,7 @@
l_with_gnu_ld_as=""
%if "%{with_binutils}" == "yes"
l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld
--with-ld=%{l_prefix}/bin/ld"
- l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as
--with-as=%{l_prefix}/bin/as --disable-multilib"
+ l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as
--with-as=%{l_prefix}/bin/as"
%else
case "%{l_platform -t}" in
*-linux* | *-freebsd* )
@@ -127,15 +128,6 @@
;;
esac
%endif
- case "%{l_platform -t}" in
- ix86*-sunos* )
- l_with_gnu_ld_as="${l_with_gnu_ld_as} --disable-multilib" ;;
- *-aix* )
- if [ ".`/usr/sbin/bootinfo -K`" = .32 ]; then
- l_with_gnu_ld_as="${l_with_gnu_ld_as} --disable-multilib"
- fi
- ;;
- esac
# determine threads usage
%if "%{with_threads}" == "yes"
@@ -194,6 +186,11 @@
%if "%{with_java}" == "yes"
--with-system-zlib \
%endif
+%if "%{with_multilib}" == "yes"
+ --enable-multilib \
+%else
+ --disable-multilib \
+%endif
${l_with_gnu_ld_as}
# determine build flags
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
