diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-06-26 20:26:41 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-06-26 20:26:41 +0000 |
| commit | 3842df5d7f5d5987de320450100ae6bca692eaad (patch) | |
| tree | cd4bcc39d78721d7a5a28847fadb651fa8aee02d /x11-base/xfree | |
| parent | portage patch updates (diff) | |
| download | historical-3842df5d7f5d5987de320450100ae6bca692eaad.tar.gz historical-3842df5d7f5d5987de320450100ae6bca692eaad.tar.bz2 historical-3842df5d7f5d5987de320450100ae6bca692eaad.zip | |
bugfix
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.0-r12.ebuild | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 01e6f6891b1a..a8f2a2659151 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.27 2002/06/24 22:12:26 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.28 2002/06/26 20:26:41 azarah Exp $ + + 26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : + + Add "-fno-merge-constants" to OptimizedCDebugFlags if the gcc in use is + not version 2.95.3. This should resolve bug #4189. 25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> : diff --git a/x11-base/xfree/xfree-4.2.0-r12.ebuild b/x11-base/xfree/xfree-4.2.0-r12.ebuild index 2f2c5bf045bc..053db0ecdd95 100644 --- a/x11-base/xfree/xfree-4.2.0-r12.ebuild +++ b/x11-base/xfree/xfree-4.2.0-r12.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.3 2002/06/10 17:51:41 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.4 2002/06/26 20:26:41 azarah Exp $ FT2_VER=2.0.9 MY_V="`echo ${PV} |sed -e 's:\.::g'`" @@ -99,7 +99,15 @@ src_unpack () { cp ${FILESDIR}/${PVR}/site.def config/cf/host.def echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ >> config/cf/host.def - echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def + + if [ "`gcc -dumpversion`" != "2.95.3" ] + then + # should fix bug #4189 + echo "#define OptimizedCDebugFlags ${CFLAGS} -fno-merge-constants" >> \ + config/cf/host.def + else + echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def + fi echo "#define GccWarningOptions -pipe" >> config/cf/host.def if [ "${ARCH}" = "x86" ] |