diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2006-06-29 12:56:17 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2006-06-29 12:56:17 +0000 |
| commit | 552838e940f4d914a48015d7136ac8bcceddbdaa (patch) | |
| tree | 58dfd9bd628bf070914df6e1278d16dcecbfdd33 /app-crypt/bestcrypt | |
| parent | stable on amd64 wrt bug 135974 (diff) | |
| download | gentoo-2-552838e940f4d914a48015d7136ac8bcceddbdaa.tar.gz gentoo-2-552838e940f4d914a48015d7136ac8bcceddbdaa.tar.bz2 gentoo-2-552838e940f4d914a48015d7136ac8bcceddbdaa.zip | |
clean up hardened flag filtering for gcc41 compatability bug #137146
(Portage version: 2.1.1_pre1-r5)
Diffstat (limited to 'app-crypt/bestcrypt')
| -rw-r--r-- | app-crypt/bestcrypt/ChangeLog | 7 | ||||
| -rw-r--r-- | app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild | 5 | ||||
| -rw-r--r-- | app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch | 22 |
3 files changed, 31 insertions, 3 deletions
diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog index eac8c82a31c9..ed01b96e74c1 100644 --- a/app-crypt/bestcrypt/ChangeLog +++ b/app-crypt/bestcrypt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/bestcrypt # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.43 2006/05/29 09:07:20 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.44 2006/06/29 12:56:17 dragonheart Exp $ + + 29 Jun 2006; Daniel Black <dragonheart@gentoo.org> + +files/bestcrypt-1.6_p5-gcc41.patch, bestcrypt-1.6_p5.ebuild: + clean up hardened flag filtering for gcc41 compatability bug #137146 thanks + to Craig 29 May 2006; Daniel Black <dragonheart@gentoo.org> -files/bestcrypt-1.5_p10-makefile_fix.patch, diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild index b74622aac49c..6489bd3d30e2 100644 --- a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild +++ b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.2 2006/05/29 00:30:09 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.3 2006/06/29 12:56:17 dragonheart Exp $ inherit flag-o-matic eutils linux-mod toolchain-funcs @@ -38,6 +38,7 @@ MODULE_NAMES="bc(block:"${S}"/mod) src_unpack() { unpack ${A} epatch "${FILESDIR}"/${P}-makefile_fix.patch + epatch "${FILESDIR}"/${P}-gcc41.patch epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch if use x86; @@ -56,7 +57,7 @@ src_compile() { emake -C src CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed" # Don't put stack protection in the kernel - it just is bad - append-flags -fno-stack-protector-all -fno-stack-protector + _filter-hardened -fstack-protector-all -fstack-protector emake -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \ || die "compile failed" diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch new file mode 100644 index 000000000000..7ea35e0aa205 --- /dev/null +++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch @@ -0,0 +1,22 @@ +--- bcrypt/kgsha/Makefile 2006-06-29 22:51:13.000000000 +1000 ++++ /tmp/bcrypt-nowarnerror/kgsha/Makefile 2006-06-29 22:40:16.000000000 +1000 +@@ -19,7 +19,7 @@ + LD = ld -d -shared + + CPP=g++ +-CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g ++CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g + CPPFLAGS += $(EXTRA_CXXFLAGS) + + TARGET = libkgsha.so +--- bcrypt/kgsha256/Makefile 2006-06-29 22:51:13.000000000 +1000 ++++ /tmp/bcrypt-nowarnerror/kgsha256/Makefile 2006-06-29 22:40:30.000000000 +1000 +@@ -19,7 +19,7 @@ + LD = ld -d -shared + + CPP=g++ +-CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g ++CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g + CPPFLAGS += $(EXTRA_CXXFLAGS) + + TARGET = libkgsha256.so |