diff options
| author |   Daniel Ostrow <dostrow@gentoo.org> | 2005-04-07 01:46:02 +0000 |
|---|---|---|
| committer | Daniel Ostrow <dostrow@gentoo.org> | 2005-04-07 01:46:02 +0000 |
| commit | 3053ab0c222d40dc712969df3283d80c718b3112 (patch) | |
| tree | 92a859befe7c6f40e19c156b8a33390156987bea /dev-libs/glib | |
| parent | Stable on SPARC. (diff) | |
| download | gentoo-2-3053ab0c222d40dc712969df3283d80c718b3112.tar.gz gentoo-2-3053ab0c222d40dc712969df3283d80c718b3112.tar.bz2 gentoo-2-3053ab0c222d40dc712969df3283d80c718b3112.zip | |
Patches for ppc64 hardened
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch | 11 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.6.3.ebuild | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 7f4feb97190f..31c642dad07f 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/glib # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.133 2005/04/02 03:10:53 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.134 2005/04/07 01:46:02 dostrow Exp $ + + 06 Apr 2005; Daniel Ostrow <dostrow@gentoo.org> glib-2.6.3.ebuild: + Patches for ppc64 hardened 02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> glib-2.6.2-r1.ebuild: stable on mips diff --git a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch new file mode 100644 index 000000000000..9b104dd570ef --- /dev/null +++ b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch @@ -0,0 +1,11 @@ +--- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000 ++++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000 +@@ -50,7 +50,7 @@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ -fno-stack-protector + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ diff --git a/dev-libs/glib/glib-2.6.3.ebuild b/dev-libs/glib/glib-2.6.3.ebuild index 6ce9e1b92af7..8eca968ec03d 100644 --- a/dev-libs/glib/glib-2.6.3.ebuild +++ b/dev-libs/glib/glib-2.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.3.ebuild,v 1.3 2005/04/01 04:07:45 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.6.3.ebuild,v 1.4 2005/04/07 01:46:02 dostrow Exp $ inherit libtool eutils flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2" LICENSE="LGPL-2" SLOT="2" KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 sparc" -IUSE="doc" +IUSE="doc hardened" DEPEND=">=dev-util/pkgconfig-0.14 >=sys-devel/gettext-0.11 @@ -24,6 +24,10 @@ src_unpack() { unpack ${A} cd ${S} use ppc-macos && epatch ${FILESDIR}/${PN}-2-macos.patch + if (use ppc64 && use hardened); then + replace-flags -O[2-3] -O1 + epatch ${FILESDIR}/glib-2.6.3-testglib-ssp.patch + fi } |