[paketler-commits] r37560 - in devel/system/devel/gcc: . files files/redhat
paketler-commits at pardus.org.tr
paketler-commits at pardus.org.tr
29 Ara 2007 Cmt 21:23:12 EET
Author: cartman
Date: Sat Dec 29 21:23:12 2007
New Revision: 37560
Added:
devel/system/devel/gcc/files/no-phase.patch
devel/system/devel/gcc/files/redhat/
devel/system/devel/gcc/files/redhat/build-id.patch
devel/system/devel/gcc/files/redhat/const-dso-handle.patch
devel/system/devel/gcc/files/redhat/hash-style-gnu.patch
devel/system/devel/gcc/files/revert-r130788.patch
Modified:
devel/system/devel/gcc/actions.py
devel/system/devel/gcc/files/pr26061.patch
devel/system/devel/gcc/pspec.xml
Log:
merge
Modified: devel/system/devel/gcc/actions.py
=================================================================
--- devel/system/devel/gcc/actions.py (original)
+++ devel/system/devel/gcc/actions.py Sat Dec 29 21:23:12 2007
@@ -23,11 +23,16 @@
STDCXX_INCDIR = "/usr/lib/gcc/%s/4.3.0/include/g++-v3" % get.HOST()
def setup():
- # gcc don't like mcpu flag while bootstrapping itself
- shelltools.export("CFLAGS", "-march=i686 -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
- shelltools.export("CXXFLAGS", "-march=i686 -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
+ # We revert the patch for this PR
+ shelltools.unlink("gcc/testsuite/gcc.dg/tree-ssa/pr32901.c")
- conf ="--prefix=%s \
+ shelltools.export("CFLAGS", "-march=i686 -mtune=generic -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
+ shelltools.export("CXXFLAGS", "-march=i686 -mtune=generic -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
+
+ # Touch ouf of date files
+ shelltools.system("./contrib/gcc_update --touch")
+
+ conf ='--prefix=%s \
--bindir=%s \
--includedir=%s \
--datadir=%s \
@@ -41,10 +46,12 @@
--disable-multilib \
--disable-nls \
--disable-werror \
- --disable-checking \
+ --disable-mudflap \
+ --disable-libmudflap \
+ --enable-checking=release \
--enable-clocale=gnu \
--enable-__cxa_atexit \
- --enable-languages=c,c++,fortran,objc,obj-c++,treelang \
+ --enable-languages=c,c++,fortran,objc \
--enable-libstdcxx-allocator=new \
--enable-shared \
--enable-ssp \
@@ -53,7 +60,8 @@
--without-included-gettext \
--without-system-libunwind \
--with-system-zlib \
- --with-bugurl=http://bugs.pardus.org.tr" % (PREFIX, BINPATH, INCDIR, DATAPATH, MANPATH, INFOPATH, STDCXX_INCDIR, get.HOST(), get.HOST())
+ --with-pkgversion="Pardus Linux" \
+ --with-bugurl=http://bugs.pardus.org.tr' % (PREFIX, BINPATH, INCDIR, DATAPATH, MANPATH, INFOPATH, STDCXX_INCDIR, get.HOST(), get.HOST())
shelltools.makedirs("build-default-i686-pc-linux-gnu")
shelltools.cd("build-default-i686-pc-linux-gnu")
@@ -61,13 +69,14 @@
shelltools.system("../configure %s" % conf)
def build():
- # gcc don't like mcpu flag while bootstrapping itself
- shelltools.export("CFLAGS", "-march=i686 -ftree-vectorize -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
- shelltools.export("CXXFLAGS", "-march=i686 -ftree-vectorize -O2 -pipe -fomit-frame-pointer -U_FORTIFY_SOURCE")
-
shelltools.cd("build-default-i686-pc-linux-gnu")
autotools.make('LDFLAGS="%s" LIBPATH="%s" BOOT_CFLAGS="%s" profiledbootstrap' % (get.LDFLAGS(), LIBPATH, get.CFLAGS()))
+def check():
+ shelltools.cd("build-default-i686-pc-linux-gnu")
+ shelltools.system("make -j5 -k check")
+ shelltools.system("../contrib/test_summary -t > test-summary.log")
+
def install():
shelltools.cd("build-default-i686-pc-linux-gnu")
Modified: devel/system/devel/gcc/files/pr26061.patch
=================================================================
--- devel/system/devel/gcc/files/pr26061.patch (original)
+++ devel/system/devel/gcc/files/pr26061.patch Sat Dec 29 21:23:12 2007
@@ -1,15 +1,140 @@
---- gcc/toplev.c 2006-10-09 19:27:14.000000000 +0300
-+++ gcc/toplev.c 2007-01-26 20:59:19.395519510 +0200
-@@ -1975,6 +1975,12 @@
+diff --git a/gcc/common.opt b/gcc/common.opt
+index e4916e4..d84f3ec 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -927,6 +927,10 @@ fshow-column
+ Common C ObjC C++ ObjC++ Report Var(flag_show_column) Init(0)
+ Show column numbers in diagnostics, when available. Default off
+
++fshow-error-count
++Common Report Var(flag_show_error_count) Init(1)
++Show total number of error and warning messages issued at the end. Default on
++
+ fsignaling-nans
+ Common Report Var(flag_signaling_nans) Optimization
+ Disable optimizations observable by IEEE signaling NaNs
+diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
+index c188824..5bcbee0 100644
+--- a/gcc/testsuite/lib/g++.exp
++++ b/gcc/testsuite/lib/g++.exp
+@@ -274,6 +274,7 @@ proc g++_target_compile { source dest type options } {
+
+ lappend options "additional_flags=[libio_include_flags]"
+ lappend options "additional_flags=-fno-show-column"
++ lappend options "additional_flags=-fno-show-error-count"
+ lappend options "compiler=$GXX_UNDER_TEST"
+
+ set options [concat $gpp_compile_options $options]
+diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
+index 286e125..8f0f7a0 100644
+--- a/gcc/testsuite/lib/gcc.exp
++++ b/gcc/testsuite/lib/gcc.exp
+@@ -151,6 +151,7 @@ proc gcc_target_compile { source dest type options } {
+ lappend options "timeout=[target_info gcc,timeout]"
+ }
+ lappend options "additional_flags=-fno-show-column"
++ lappend options "additional_flags=-fno-show-error-count"
+ lappend options "compiler=$GCC_UNDER_TEST"
+ set options [dg-additional-files-options $options $source]
+ return [target_compile $source $dest $type $options]
+diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
+index c00ee09..ad957e1 100644
+--- a/gcc/testsuite/lib/gfortran.exp
++++ b/gcc/testsuite/lib/gfortran.exp
+@@ -193,6 +193,7 @@ proc gfortran_target_compile { source dest type options } {
+ }
+
+ lappend options "compiler=$GFORTRAN_UNDER_TEST"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ set options [concat "$ALWAYS_GFORTRANFLAGS" $options]
+ set options [dg-additional-files-options $options $source]
+diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp
+index 37882cb..176c9ea 100644
+--- a/gcc/testsuite/lib/obj-c++.exp
++++ b/gcc/testsuite/lib/obj-c++.exp
+@@ -324,6 +324,7 @@ proc obj-c++_target_compile { source dest type options } {
+
+ lappend options "additional_flags=[libio_include_flags]"
+ lappend options "compiler=$OBJCXX_UNDER_TEST";
++ lappend options "additional_flags=-fno-show-error-count"
+
+ set options [concat $gpp_compile_options $options]
+
+diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
+index 3f02571..1c0fef1 100644
+--- a/gcc/testsuite/lib/objc.exp
++++ b/gcc/testsuite/lib/objc.exp
+@@ -193,6 +193,7 @@ proc objc_target_compile { source dest type options } {
+ set source [concat "-x objective-c-header" $source]
+ }
+ lappend options "compiler=$OBJC_UNDER_TEST"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ set_ld_library_path_env_vars
+
+diff --git a/gcc/toplev.c b/gcc/toplev.c
+index 63b387f..8ecc20d 100644
+--- a/gcc/toplev.c
++++ b/gcc/toplev.c
+@@ -2214,6 +2214,12 @@ finalize (void)
/* Language-specific end of compilation actions. */
lang_hooks.finish ();
+
+
+ /* Print error / warning counts. */
-+ if ( errorcount || warningcount )
++ if ( flag_show_error_count && (errorcount || warningcount ))
+ fprintf (stderr, "\n*** %d errors, %d warnings\n",
+ errorcount, warningcount);
}
/* Initialize the compiler, and compile the input file. */
+diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp
+index 11dd39c..9c2d5a8 100644
+--- a/libffi/testsuite/lib/libffi-dg.exp
++++ b/libffi/testsuite/lib/libffi-dg.exp
+@@ -197,6 +197,7 @@ proc libffi_target_compile { source dest type options } {
+ }
+
+ lappend options "libs= -lffi"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ verbose "options: $options"
+ return [target_compile $source $dest $type $options]
+diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
+index 2e9f9d8..9a8541f 100644
+--- a/libgomp/testsuite/lib/libgomp.exp
++++ b/libgomp/testsuite/lib/libgomp.exp
+@@ -170,6 +170,7 @@ proc libgomp_target_compile { source dest type options } {
+
+ lappend options "additional_flags=[libio_include_flags]"
+ lappend options "compiler=$GCC_UNDER_TEST"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ set options [concat $libgomp_compile_options $options]
+
+diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp
+index 94d060b..b43127d 100644
+--- a/libmudflap/testsuite/lib/libmudflap.exp
++++ b/libmudflap/testsuite/lib/libmudflap.exp
+@@ -217,6 +217,7 @@ proc libmudflap_target_compile { source dest type options } {
+ # Picks up the freshly-built testsuite library corresponding to the
+ # multilib under test.
+ lappend options "ldflags=-L${blddir}/testsuite"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ return [target_compile $source $dest $type $options]
+ }
+diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
+index b482bf5..3b6dbbe 100644
+--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
++++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
+@@ -387,6 +387,7 @@ proc v3_target_compile { source dest type options } {
+
+ lappend options "compiler=$cxx_final"
+ lappend options "timeout=600"
++ lappend options "additional_flags=-fno-show-error-count"
+
+ return [target_compile $source $dest $type $options]
+ }
Modified: devel/system/devel/gcc/pspec.xml
=================================================================
--- devel/system/devel/gcc/pspec.xml (original)
+++ devel/system/devel/gcc/pspec.xml Sat Dec 29 21:23:12 2007
@@ -8,12 +8,12 @@
<Name>S.Çağlar Onur</Name>
<Email>caglar at pardus.org.tr</Email>
</Packager>
- <License>GPLv3</License>
- <License>LGPLv3</License>
+ <License>GPLv3+</License>
+ <License>LGPLv3+</License>
<IsA>app:console</IsA>
- <Summary>The GNU Compiler Collection. Includes C/C++,Objective-C and Fortran compilers</Summary>
- <Description>The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, as well as libraries for these languages (libstdc++, libgcj,...)</Description>
- <Archive sha1sum="8167d86723b68b125656b33ceb2e1462a108125e" type="tarbz2">ftp://gcc.gnu.org/pub/gcc/snapshots/4.3-20071123/gcc-4.3-20071123.tar.bz2</Archive>
+ <Summary>The GNU Compiler Collection, includes C, C++, Objective-C and Fortran compilers</Summary>
+ <Description>The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, as well as libraries for these languages</Description>
+ <Archive sha1sum="ad83074c4883b8e16cf29225b3640ac9a5e427be" type="tarbz2">http://cekirdek.pardus.org.tr/~ismail/dist/gcc-4.3-20071229.tar.bz2</Archive>
<BuildDependencies>
<Dependency versionFrom="1.1.4">zlib</Dependency>
<Dependency versionFrom="2.17.50.0.17">binutils</Dependency>
@@ -25,9 +25,18 @@
<Dependency versionFrom="4">sed</Dependency>
<Dependency>patch</Dependency>
<Dependency versionFrom="2.3.0">mpfr</Dependency>
+ <Dependency>dejagnu</Dependency>
</BuildDependencies>
<Patches>
- <Patch>pr26061.patch</Patch>
+ <!-- Some patches from Redhat gcc 4.3 branch -->
+ <Patch>redhat/const-dso-handle.patch</Patch>
+ <Patch>redhat/hash-style-gnu.patch</Patch>
+ <Patch>redhat/build-id.patch</Patch>
+
+ <!-- Pardus only patches -->
+ <Patch level="1">pr26061.patch</Patch>
+ <Patch>no-phase.patch</Patch>
+ <Patch>revert-r130788.patch</Patch>
</Patches>
</Source>
@@ -71,9 +80,16 @@
</Package>
<History>
+ <Update release="31">
+ <Date>2007-12-29</Date>
+ <Version>4.3_pre20071229</Version>
+ <Comment>Update to 4.3 branch</Comment>
+ <Name>İsmail Dönmez</Name>
+ <Email>ismail at pardus.org.tr</Email>
+ </Update>
<Update release="30">
- <Date>2007-11-23</Date>
- <Version>4.3_pre20071123</Version>
+ <Date>2007-12-02</Date>
+ <Version>4.3_pre20071202</Version>
<Comment>Update to 4.3 branch</Comment>
<Name>İsmail Dönmez</Name>
<Email>ismail at pardus.org.tr</Email>
Paketler-commits mesaj listesiyle ilgili
daha fazla bilgi