OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2004 10:17:28
Branch: HEAD Handle: 2004042109172800
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
Log:
upgrading package: gcc 3.3.3 -> 3.4.0
Summary:
Revision Changes Path
1.15 +30 -19 openpkg-src/gcc/gcc.patch
1.89 +23 -11 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 gcc.patch
--- openpkg-src/gcc/gcc.patch 18 Feb 2004 19:10:05 -0000 1.14
+++ openpkg-src/gcc/gcc.patch 21 Apr 2004 08:17:28 -0000 1.15
@@ -1,21 +1,44 @@
-Index: gcc/config/i386/sol2.h
---- gcc/config/i386/sol2.h.orig 2002-06-20 13:03:34.000000000 +0200
-+++ gcc/config/i386/sol2.h 2003-09-27 14:54:58.000000000 +0200
-@@ -66,3 +66,5 @@
+--- config.guess.orig Thu Jan 30 23:32:36 2003
++++ config.guess Wed Feb 5 09:54:43 2003
+@@ -188,7 +188,7 @@
+ release='-gnu'
+ ;;
+ *)
+- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+--- gcc/config/i386/sol2.h.dist Thu Feb 27 15:00:54 2003
++++ gcc/config/i386/sol2.h Thu Feb 27 14:20:50 2003
+@@ -160,3 +160,5 @@
/* The Solaris assembler does not support .quad. Do not use it. */
#undef ASM_QUAD
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 1
-Index: gcc/version.c
+
+--- gcc/system.h.orig 2003-08-23 20:03:05.000000000 +0200
++++ gcc/system.h 2003-09-03 20:02:11.000000000 +0200
+@@ -314,10 +314,6 @@
+ extern char *strstr (const char *, const char *);
+ #endif
+
+-#ifdef HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
+-
+ #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
+ extern void *malloc (size_t);
+ #endif
--- gcc/version.c.orig 2003-08-04 14:50:23.000000000 +0200
+++ gcc/version.c 2003-09-27 15:01:39.000000000 +0200
@@ -6,7 +6,7 @@
please modify this string to indicate that, e.g. by putting your
organization's name in parentheses at the end of the string. */
--const char version_string[] = "3.3.3";
-+const char version_string[] = "3.3.3 (@l_openpkg_release@)";
+-const char version_string[] = "3.4.0";
++const char version_string[] = "3.4.0 (@l_openpkg_release@)";
/* This is the location of the online document giving instructions for
reporting bugs. If you distribute a modified version of GCC,
@@ -25,15 +48,3 @@
-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
+const char bug_report_url[] = "<URL:http://www.openpkg.org/>";
-Index: config.guess
---- config.guess.orig 2003-01-31 00:25:36.000000000 +0100
-+++ config.guess 2003-09-27 14:54:58.000000000 +0200
-@@ -188,7 +188,7 @@
- release='-gnu'
- ;;
- *)
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.88 -r1.89 gcc.spec
--- openpkg-src/gcc/gcc.spec 18 Feb 2004 11:26:35 -0000 1.88
+++ openpkg-src/gcc/gcc.spec 21 Apr 2004 08:17:28 -0000 1.89
@@ -23,8 +23,10 @@
## SUCH DAMAGE.
##
+# FIXME: with_bounds and with_ssp broken until updated versions are released
+
# package version
-%define V_full 3.3.3
+%define V_full 3.4.0
%define V_comp %nil
%define V_bounds 3.3.3-1.00
%define V_ssp 3.3-7
@@ -40,7 +42,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20040218
+Release: 20040421
# package options
%option with_cxx yes
@@ -161,15 +163,22 @@
l_enable_languages="${l_enable_languages},f77"
%endif
+ # disable GNU iconv usage
+ ( echo "am_cv_func_iconv=no"
+ echo "am_cv_lib_iconv=no"
+ ) >config.cache
+
# configure the package
CC="%{l_cc}" \
CFLAGS="%{l_cflags}" \
../configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--exec-prefix=%{l_prefix} \
--includedir=%{l_prefix}/include/gcc%{V_comp} \
+ --libexecdir=%{l_prefix}/libexec/gcc%{V_comp} \
--with-gxx-include-dir=%{l_prefix}/include/g++%{V_comp} \
- --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp}-lib \
+ --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp} \
--enable-languages="${l_enable_languages}" \
--enable-threads="${l_enable_threads}" \
--disable-maintainer-mode \
@@ -177,9 +186,9 @@
--disable-nls \
${l_with_gnu_ld_as}
- # explicitly redirect remaining gcc-lib directories
+ # explicitly redirect remaining gcc library directories
%{l_shtool} subst -v -s \
- -e "s;/gcc-lib/;/gcc%{V_comp}-lib/;" \
+ -e "s;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;" \
`find . -name Makefile -type f -print`
# determine build flags
@@ -198,8 +207,8 @@
l_cflags="$l_cflags -O"
l_boot_cflags="$l_boot_cflags -O2 -fomit-frame-pointer -funroll-loops"
case "%{l_platform -t}" in
- *i?86-* ) l_boot_cflags="$l_boot_cflags -mcpu=pentium3" ;;
- *sun4u-* ) l_boot_cflags="$l_boot_cflags -mtune=v9" ;;
+ *i?86-* ) l_boot_cflags="$l_boot_cflags -mtune=pentium3" ;;
+ *sun4u-* ) l_boot_cflags="$l_boot_cflags -mtune=v9" ;;
esac
l_libcxxflags="$l_libcxxflags -O2 -fno-implicit-templates"
%else
@@ -231,16 +240,16 @@
# cleanup installation tree
mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/
for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do
subdir=`echo "$multilib" | sed -e 's/;.*$//'`
[ ".$subdir" = .. ] && continue
mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/$subdir/
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir
done
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
- $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/
\
+ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/ \
>/dev/null 2>&1 || true
%if "%{with_java}" == "yes"
mv $RPM_BUILD_ROOT%{l_prefix}/share/java \
@@ -258,7 +267,7 @@
%endif
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
for prog in cc1 cc1plus collect2 cpp; do
- strip
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/${prog} \
+ strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/${prog} \
>/dev/null 2>&1 || true
done
@@ -276,16 +285,19 @@
%if "%{with_gcc}" != "yes" && "%{V_comp}" != ""
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for file in *; do
+ [ ".$file" = ".*" ] && continue
mv ${file} ${file}%{V_comp}
done
) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}/info
for file in *; do
+ [ ".$file" = ".*" ] && continue
mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
done
) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
for file in *; do
+ [ ".$file" = ".*" ] && continue
mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
done
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
