From ee759e4a07328e039b7ab71e84b496933866c584 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 4 Oct 2005 23:00:00 +0000 Subject: [PATCH] Clean up ebuild, respect user CFLAGS, and fix executable stack markings. Package-Manager: portage-2.0.51.22-r2 --- dev-libs/libaio/ChangeLog | 9 ++++- dev-libs/libaio/Manifest | 20 +++++++++-- dev-libs/libaio/files/digest-libaio-0.3.15-r1 | 1 + .../libaio/files/libaio-0.3.15-CFLAGS.patch | 14 ++++++++ .../files/libaio-0.3.15-no-exec-stack.patch | 13 +++++++ dev-libs/libaio/libaio-0.3.15-r1.ebuild | 35 +++++++++++++++++++ 6 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 dev-libs/libaio/files/digest-libaio-0.3.15-r1 create mode 100644 dev-libs/libaio/files/libaio-0.3.15-CFLAGS.patch create mode 100644 dev-libs/libaio/files/libaio-0.3.15-no-exec-stack.patch create mode 100644 dev-libs/libaio/libaio-0.3.15-r1.ebuild diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog index aa821993ff3e..6af80aa63e95 100644 --- a/dev-libs/libaio/ChangeLog +++ b/dev-libs/libaio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libaio # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.9 2005/10/02 19:54:46 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.10 2005/10/04 23:00:00 vapier Exp $ + +*libaio-0.3.15-r1 (04 Oct 2005) + + 04 Oct 2005; Mike Frysinger + +files/libaio-0.3.15-CFLAGS.patch, + +files/libaio-0.3.15-no-exec-stack.patch, +libaio-0.3.15-r1.ebuild: + Clean up ebuild, respect user CFLAGS, and fix executable stack markings. 02 Oct 2005; Aron Griffis libaio-0.3.15.ebuild: Mark 0.3.15 stable on alpha diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index 75396e03aef0..05c745060a76 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -1,7 +1,21 @@ -MD5 a2ab6b08b0c0abf362ad1c3f8390cbbf ChangeLog 1125 -MD5 29e53943085f389f153bbadeb849ecee libaio-0.3.15.ebuild 909 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 21b52191ea78f5212b490edc3a9322dc libaio-0.3.15-r1.ebuild 986 MD5 08aeb8a15f772dfe8e124e6ea138ddef libaio-0.3.92.ebuild 649 +MD5 d4126848bd14dd7824f556c30daa172b ChangeLog 1390 +MD5 29e53943085f389f153bbadeb849ecee libaio-0.3.15.ebuild 909 MD5 9ab89b277f4e93b87b8a50f7c524b0d9 files/digest-libaio-0.3.15 71 -MD5 da0b52d4053e3f897aa738e9adeee32b files/libaio-0.3.15-more-arches.patch 1649 +MD5 2397f736c573f05d5f50a588ec984eee files/libaio-0.3.15-CFLAGS.patch 325 MD5 7991c55ade205cb4de301576e8b4b524 files/libaio-0.3.15-2.5-2-Makefile.patch 430 +MD5 014fb327dc5e5d3930b0191632efd43f files/libaio-0.3.15-no-exec-stack.patch 316 +MD5 9ab89b277f4e93b87b8a50f7c524b0d9 files/digest-libaio-0.3.15-r1 71 MD5 79f7b9e04e046cf3a0b7594f26eee18a files/digest-libaio-0.3.92 65 +MD5 da0b52d4053e3f897aa738e9adeee32b files/libaio-0.3.15-more-arches.patch 1649 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDQwnHgIKl8Uu19MoRAn9RAJ9RqIhFZQHU1scyDiqj/RvuFUy8sQCdGh1S +P5/qqMDYq7eM/exjQ9PCsOM= +=oWD+ +-----END PGP SIGNATURE----- diff --git a/dev-libs/libaio/files/digest-libaio-0.3.15-r1 b/dev-libs/libaio/files/digest-libaio-0.3.15-r1 new file mode 100644 index 000000000000..ecd66ade074c --- /dev/null +++ b/dev-libs/libaio/files/digest-libaio-0.3.15-r1 @@ -0,0 +1 @@ +MD5 51a913e1a662590eb86bc561a02e0aa2 libaio-0.3.15-2.5-2.tar.bz2 21026 diff --git a/dev-libs/libaio/files/libaio-0.3.15-CFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.15-CFLAGS.patch new file mode 100644 index 000000000000..0b4483c06cfc --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.15-CFLAGS.patch @@ -0,0 +1,14 @@ +Respect env CFLAGS and build shared objects as PIC + +--- libaio/src/Makefile ++++ libaio/src/Makefile +@@ -1,7 +1,7 @@ + prefix=/usr + +-CFLAGS=-nostdlib -nostartfiles -Wall -I. -g -O2 +-SO_CFLAGS=-shared $(CFLAGS) ++CFLAGS+=-nostdlib -nostartfiles -Wall -I. ++SO_CFLAGS=-shared $(CFLAGS) -fPIC + L_CFLAGS=$(CFLAGS) + LINK_FLAGS=-L. + diff --git a/dev-libs/libaio/files/libaio-0.3.15-no-exec-stack.patch b/dev-libs/libaio/files/libaio-0.3.15-no-exec-stack.patch new file mode 100644 index 000000000000..e26c499a6c70 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.15-no-exec-stack.patch @@ -0,0 +1,13 @@ +Make sure that the asm files don't incorrectly trigger an executable +stack marking in the final shared library. That's bad, mmmkay. + +--- src/ia64_syscall.S ++++ src/ia64_syscall.S +@@ -15,3 +15,7 @@ + br.ret.sptk.many rp + .endp __ia64_syscall + #endif ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif diff --git a/dev-libs/libaio/libaio-0.3.15-r1.ebuild b/dev-libs/libaio/libaio-0.3.15-r1.ebuild new file mode 100644 index 000000000000..51d7f1ab5b77 --- /dev/null +++ b/dev-libs/libaio/libaio-0.3.15-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.15-r1.ebuild,v 1.1 2005/10/04 23:00:00 vapier Exp $ + +inherit eutils multilib + +MY_PV=${PV}-2.5-2 +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" +HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/" +SRC_URI="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/${MY_P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86" +IUSE="" + +DEPEND="" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-CFLAGS.patch + epatch "${FILESDIR}"/${P}-more-arches.patch + epatch "${FILESDIR}"/${P}-no-exec-stack.patch + sed -i -e "s:/lib/:/$(get_libdir)/:g" src/Makefile +} + +src_install() { + make prefix="${D}"/usr install || die + dodoc ChangeLog TODO +} -- 2.26.2