diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-17 04:39:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-17 04:39:29 +0000 |
| commit | da4e54cf5ae04e799bf3bac8a34228bdb5b62f05 (patch) | |
| tree | e308cd0b3a7dfd2768b417d9a405cdb0b90fd360 /sys-process | |
| parent | Make it build for mingw targets #393573 by jingtaozf. (diff) | |
| download | gentoo-2-da4e54cf5ae04e799bf3bac8a34228bdb5b62f05.tar.gz gentoo-2-da4e54cf5ae04e799bf3bac8a34228bdb5b62f05.tar.bz2 gentoo-2-da4e54cf5ae04e799bf3bac8a34228bdb5b62f05.zip | |
Fix TEXTRELs when building fuser as a PIE #394443 by Attila Tóth.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/psmisc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch | 17 | ||||
| -rw-r--r-- | sys-process/psmisc/psmisc-22.16.ebuild | 10 |
3 files changed, 30 insertions, 3 deletions
diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog index be5854f6f28a..cd281d437fb5 100644 --- a/sys-process/psmisc/ChangeLog +++ b/sys-process/psmisc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-process/psmisc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.123 2012/03/12 14:17:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.124 2012/05/17 04:39:29 vapier Exp $ + + 17 May 2012; Mike Frysinger <vapier@gentoo.org> + +files/psmisc-22.16-fuser-pic.patch, psmisc-22.16.ebuild: + Fix TEXTRELs when building fuser as a PIE #394443 by Attila Tóth. *psmisc-22.16 (12 Mar 2012) diff --git a/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch b/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch new file mode 100644 index 000000000000..40a3c0c0d35f --- /dev/null +++ b/sys-process/psmisc/files/psmisc-22.16-fuser-pic.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/401851 +http://sourceforge.net/tracker/?func=detail&aid=3504801&group_id=15273&atid=115273 + +the x86 asm code is not PIC friendly, so disable it and fall back to the +gcc builtin for doing prefetching + +--- src/lists.h ++++ src/lists.h +@@ -68,7 +68,7 @@ + asm volatile ("lfetch [%0]" :: "r" (x)) + #elif defined(__powerpc64__) + asm volatile ("dcbt 0,%0" :: "r" (x)) +-#elif !defined(__CYGWIN__) && defined(__i386__) ++#elif !defined(__CYGWIN__) && !defined(__PIC__) && defined(__i386__) + asm volatile ("661:\n\t" + ".byte 0x8d,0x74,0x26,0x00\n" + "\n662:\n" diff --git a/sys-process/psmisc/psmisc-22.16.ebuild b/sys-process/psmisc/psmisc-22.16.ebuild index 7d928f72013a..213c8cd7c41c 100644 --- a/sys-process/psmisc/psmisc-22.16.ebuild +++ b/sys-process/psmisc/psmisc-22.16.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.16.ebuild,v 1.1 2012/03/12 14:17:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.16.ebuild,v 1.2 2012/05/17 04:39:29 vapier Exp $ -EAPI=4 +EAPI="4" + +inherit eutils DESCRIPTION="A set of tools that use the proc filesystem" HOMEPAGE="http://psmisc.sourceforge.net/" @@ -22,6 +24,10 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog NEWS README" +src_prepare() { + epatch "${FILESDIR}"/${PN}-22.16-fuser-pic.patch #394443 +} + src_configure() { econf \ $(use_enable selinux) \ |