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: 20-Sep-2005 14:57:58
Branch: HEAD Handle: 2005092013575800
Modified files:
openpkg-src/gcc41 gcc41.patch gcc41.spec
Log:
synchronize gcc40/gcc41 packages with latest changes from gcc package
Summary:
Revision Changes Path
1.2 +14 -0 openpkg-src/gcc41/gcc41.patch
1.27 +19 -1 openpkg-src/gcc41/gcc41.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc41/gcc41.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 gcc41.patch
--- openpkg-src/gcc41/gcc41.patch 21 Apr 2005 19:03:04 -0000 1.1
+++ openpkg-src/gcc41/gcc41.patch 20 Sep 2005 12:57:58 -0000 1.2
@@ -48,3 +48,17 @@
#define HAVE_ICONV 0
typedef int iconv_t; /* dummy */
#endif
+Index: gcc/config/sol2.h
+--- gcc/config/sol2.h.orig 2004-07-17 23:18:56 +0200
++++ gcc/config/sol2.h 2005-09-19 22:01:15 +0200
+@@ -144,8 +144,8 @@
+ "%{h*} %{v:-V} \
+ %{b} %{Wl,*:%*} \
+ %{static:-dn -Bstatic} \
+- %{shared:-G -dy %{!mimpure-text:-z text}} \
+- %{symbolic:-Bsymbolic -G -dy -z text} \
++ %{shared:-G -dy} \
++ %{symbolic:-Bsymbolic -G -dy} \
+ %(link_arch) \
+ %{Qy:} %{!Qn:-Qy}"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc41/gcc41.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 gcc41.spec
--- openpkg-src/gcc41/gcc41.spec 19 Sep 2005 15:50:56 -0000 1.26
+++ openpkg-src/gcc41/gcc41.spec 20 Sep 2005 12:57:58 -0000 1.27
@@ -38,7 +38,7 @@
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
-Release: 20050919
+Release: 20050920
# package options
%option with_cxx yes
@@ -68,6 +68,10 @@
BuildPreReq: mpfr
PreReq: mpfr
%endif
+%if "%{with_java}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
AutoReq: no
AutoReqProv: no
%if "%{with_gcc}" == "yes"
@@ -100,6 +104,14 @@
%{l_shtool} subst -v -s \
-e 's;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;' \
`find . -name Makefile.in -type f -print`
+ case "%{l_platform -t}" in
+ amd64*-linux* )
+ %{l_shtool} subst \
+ -e 's/GLIBCXX_IS_NATIVE=false/GLIBCXX_IS_NATIVE=true/g' \
+ -e 's/test x.gcc_no_link = xyes/false/g' \
+ libstdc++-v3/configure
+ ;;
+ esac
%build
# create build sub-directory
@@ -154,7 +166,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 \
@@ -170,6 +185,9 @@
--disable-maintainer-mode \
--disable-shared \
--disable-nls \
+%if "%{with_java}" == "yes"
+ --with-system-zlib \
+%endif
${l_with_gnu_ld_as}
# determine build flags
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
