[gentoo-commits] gentoo-x86 commit in sys-devel/gcc: ChangeLog gcc-3.2.3-r4.ebuild

[gentoo-commits] gentoo-x86 commit in sys-devel/gcc: ChangeLog gcc-3.2.3-r4.ebuild

[Mike Frysinger (vapier)]

vapier      08/06/22 10:52:51

  Modified:             ChangeLog gcc-3.2.3-r4.ebuild
  Log:
  Fix for building with newer gcc versions #225743 by Emil Wojak.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64, RepoMan options: --force)

Revision  Changes    Path
1.654                sys-devel/gcc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/ChangeLog?rev=1.654&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/ChangeLog?rev=1.654&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/ChangeLog?r1=1.653&r2=1.654

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- ChangeLog	21 Jun 2008 04:23:11 -0000	1.653
+++ ChangeLog	22 Jun 2008 10:52:50 -0000	1.654
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.653 2008/06/21 04:23:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.654 2008/06/22 10:52:50 vapier Exp $
+
+  22 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/3.2.3/gcc-3.2.3-poisoned-malloc.patch, gcc-3.2.3-r4.ebuild:
+  Fix for building with newer gcc versions #225743 by Emil Wojak.
 
   21 Jun 2008; Mike Frysinger <vapier@gentoo.org> gcc-4.3.0.ebuild,
   gcc-4.3.1.ebuild:



1.27                 sys-devel/gcc/gcc-3.2.3-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild?r1=1.26&r2=1.27

Index: gcc-3.2.3-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gcc-3.2.3-r4.ebuild	20 Mar 2008 20:39:50 -0000	1.26
+++ gcc-3.2.3-r4.ebuild	22 Jun 2008 10:52:50 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.26 2008/03/20 20:39:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.2.3-r4.ebuild,v 1.27 2008/06/22 10:52:50 vapier Exp $
 
 inherit eutils flag-o-matic libtool versionator
 
@@ -206,39 +206,7 @@
 		cp ${WORKDIR}/protector.h ${WORKDIR}/${P}/gcc/ || die "protector.h not found"
 		version_patch ${FILESDIR}/3.2.3/gcc-323-propolice-version.patch
 
-		# check for the glibc to have the guard
-		if	[ "$(readelf -s /lib/libc.so.6 | grep GLOBAL | grep OBJECT | grep '__guard')" ] &&
-			[ "$(readelf -s /lib/libc.so.6 | grep GLOBAL | grep FUNC | grep '__stack_smash_handler')" ]
-		then
-			ewarn "this sys-libs/glibc has __guard object and __stack_smash_handler functions"
-			ewarn "scanning the system for binaries with __guard - this may take 5-10 minutes"
-			ewarn "please do not press crtl-C or crtl-Z during this period - it will continue"
-			SCANPATH="$(for i in $(cat /etc/ld.so.conf | grep -v '/usr/lib/gcc-lib' | grep -v '^\#'); do echo -n $i; echo -n ' '; done) $(echo ${PATH} | sed 's,:, ,g')"
-			if [ "$(find ${SCANPATH} -type f -perm -1 -maxdepth 9 -exec readelf -s {} \; 2>&1 | grep "__guard\@GCC" 2>&1 1>/dev/null; echo $?)" == "0" ]
-			then
-				eerror "found binaries that are dynamically linked to the libgcc with __guard@@GCC"
-				eerror "you need to compile these binaries without CFLAGS -fstack-protector/hcc -r"
-				echo
-				eerror "also you have to make sure that using ccache needs the cache to be flushed"
-				eerror "wipe out /var/tmp/ccache or /root/.ccache, this will remove possible saved"
-				eerror "-fstack-protector arguments that still may reside in such a compiler cache"
-				echo
-				eerror "when such binaries are found, gcc cannot remove libgcc propolice functions"
-				eerror "leading to gcc -static -fstack-protector breaking, see gentoo bug id 25299"
-				einfo  "you can run 'qpkg -f' from the gentoolkit package and reemerge the program"
-				einfo  "to do a full scan on your system, enter this following command in a shell:"
-				echo
-				einfo  "find / -type f -perm -1 -maxdepth 9 -exec echo -n '__guard at GCC check in: {} ' \; -exec qpkg -f {} \; -exec readelf -s {} \; 2>&1 | grep __guard | grep -B1 '__guard\@GCC'"
-				echo
-				exit 1
-			else
-				echo
-				einfo  "no binaries with suspicious libgcc __guard@GCC dependencies in ${SCANPATH}"
-				echo
-				epatch ${FILESDIR}/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch
-			fi
-		fi
-		# end of check for the glibc to have the guard
+		epatch ${FILESDIR}/3.2.3/gcc-3.2.3-move-propolice-into-glibc.patch
 	fi
 
 	# Patches from Mandrake/Suse ...
@@ -251,6 +219,7 @@
 	# GCC bugfixes ...
 	epatch ${FILESDIR}/3.2.2/gcc32-pr7768.patch
 	epatch ${FILESDIR}/3.2.2/gcc32-pr8213.patch
+	epatch ${FILESDIR}/3.2.3/gcc-3.2.3-poisoned-malloc.patch #225743
 
 	# Get gcc to decreases the number of times the collector has to be run
 	# by increasing its memory workspace, bug #16548.



-- 
gentoo-commits@lists.gentoo.org mailing list