From aceef40ece0e13a9f3c7f71b991b6d4021c2372b Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 17 Mar 2012 11:03:57 +0000 Subject: Don't build static libs, bug #408265 by Kevin Pyle; drop old. Package-Manager: portage-2.1.10.49/cvs/Linux x86_64 --- dev-libs/libaio/ChangeLog | 6 +++- dev-libs/libaio/Manifest | 11 +++---- dev-libs/libaio/libaio-0.3.109-r1.ebuild | 55 -------------------------------- dev-libs/libaio/libaio-0.3.109-r3.ebuild | 29 ++++++++++------- 4 files changed, 28 insertions(+), 73 deletions(-) delete mode 100644 dev-libs/libaio/libaio-0.3.109-r1.ebuild (limited to 'dev-libs/libaio') diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog index 615758d17c3a..d1a7ba481795 100644 --- a/dev-libs/libaio/ChangeLog +++ b/dev-libs/libaio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libaio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.63 2012/03/12 07:57:39 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.64 2012/03/17 11:03:57 pacho Exp $ + + 17 Mar 2012; Pacho Ramos -libaio-0.3.109-r1.ebuild, + libaio-0.3.109-r3.ebuild: + Don't build static libs, bug #408265 by Kevin Pyle; drop old. 12 Mar 2012; Michael Haubenwallner libaio-0.3.109-r3.ebuild: diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index 7c5d1d028378..ca4a5d0f4a6f 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -14,15 +14,14 @@ AUX libaio-0.3.109-x32.patch 2122 RMD160 60bf4ae3dccd8ba8a480a3002a03a7330d883ef DIST libaio-0.3.107.tar.gz 51540 RMD160 b1b09ec4c277a4322917493cfe6a7e532eb66032 SHA1 769a541744448a6dfc3fd3a3e335afe7aa77ca8e SHA256 e6ad9246d7cd615d90fb3d231eec94111a36a85e9ffc759ac6bdab1a03995f27 DIST libaio-0.3.109.tar.bz2 43579 RMD160 fed1f4ddb9cb9d66c40f5909a6d7c2400dcebda0 SHA1 b772e567e7089bb3ca405b16370f8b1a4997c0b3 SHA256 b5cefce0a3cb49f8dca4d00e9480c0d9b45b75863bd44764156e322ee214e794 EBUILD libaio-0.3.107.ebuild 1511 RMD160 54bffb7552c3d806075acbbebc0481816b232cd7 SHA1 27ce5a8c02185860744cc3e7cd35af85c87fac57 SHA256 6b2df4e5454e04f71a630cb24c948031a01914a13eefa4ae6b476d3251a6efdb -EBUILD libaio-0.3.109-r1.ebuild 1596 RMD160 f524720377ead44e1bfcf6481fc83bcb88de05fd SHA1 da6a03dc53e74815cd1c7f963d08f9fbfc762cc9 SHA256 dc8b6582152eee085c575cb7d4a8c69a680be9cf1c59c0ebef70bc94273af027 EBUILD libaio-0.3.109-r2.ebuild 1784 RMD160 5698afa9d0d19d19afd9d7a2efb06d2912561097 SHA1 f4269428324c60a3f45093bbcca2c5d7541abbee SHA256 0fd9d7e7f5bcc91a693c761952b512c9d8811d41c2afa2c1c18dd0528a6e1958 -EBUILD libaio-0.3.109-r3.ebuild 3208 RMD160 b24f3268308b23c3d09bc67bcd87d106dd145f4f SHA1 ebc8d0a11337726bed6bf1b230825b8e06712f69 SHA256 9a0bd998df9128ac6d2c4b2c48fa3dfc38b2776c0d7ea63786a2cec45956cc89 -MISC ChangeLog 8793 RMD160 fb273087368ecd77aa09bee5c72ec6896d3181a7 SHA1 53b656386a01e90fa5c41533500cf40e19e03fe4 SHA256 aead79a8e3b41eff67234ec0dee4af6077746bfdcfd8cfa3ebb5bbfca3b45afb +EBUILD libaio-0.3.109-r3.ebuild 3490 RMD160 abdea6e0741c0f9a0f6e7f8de3a2cfec1b9c3e8c SHA1 30315e3375ea181729580ca3a47e7947dc65de34 SHA256 4ebd9387f2f28f0d6b7f84b1cef050628ac7dd10bd98b318272e77544081280a +MISC ChangeLog 8959 RMD160 785798596d5c122196dba50a94ba56f24e17360d SHA1 b14df8ab234a0b99553f153953b55fbabb5bdcfc SHA256 82bb5e95cd1d9f3f0fa13929921cf08971dd14927ccba2b135ff77edd86f52d6 MISC metadata.xml 414 RMD160 729568392408a479b1c7dd127c8c158afdfffb77 SHA1 212f6c187d77b0a44db05f5eee1bcc802592bad7 SHA256 06f23f3cae96ee5bdfa7925483540566826c2756d62431921c27f70928bd8d19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9drQYACgkQLc0TWKYwzLjZEgCdFSZm1nZ2+CwQPm+g+siGu+19 -mCYAn1vif6Tv1cvaVAADIK7tVxlXlI9u -=12ZY +iEYEARECAAYFAk9kb6MACgkQCaWpQKGI+9QgcQCfTrjoiehfZ3QB3v/6bPzAGrp6 +RGEAnRaZj85ZhutuW1l8PgdqBXpVl+M5 +=/UPY -----END PGP SIGNATURE----- diff --git a/dev-libs/libaio/libaio-0.3.109-r1.ebuild b/dev-libs/libaio/libaio-0.3.109-r1.ebuild deleted file mode 100644 index 78a9c0da5345..000000000000 --- a/dev-libs/libaio/libaio-0.3.109-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r1.ebuild,v 1.1 2010/10/21 23:56:38 vapier Exp $ - -EAPI="3" - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/ http://lse.sourceforge.net/io/aio.html" -SRC_URI="mirror://kernel/linux/libs/aio/${P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static-libs" - -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.3.109-unify-bits-endian.patch - epatch "${FILESDIR}"/${PN}-0.3.109-generic-arch.patch - epatch "${FILESDIR}"/${PN}-0.3.106-build.patch - epatch "${FILESDIR}"/${PN}-0.3.107-ar-ranlib.patch - epatch "${FILESDIR}"/${PN}-0.3.109-install.patch - sed -i \ - -e "/^libdir=/s:lib$:$(get_libdir):" \ - -e "/^prefix=/s:/usr:${EPREFIX}/usr:" \ - src/Makefile Makefile || die -} - -src_configure() { - tc-export AR CC RANLIB -} - -src_test() { - cd "${S}"/harness - mkdir testdir - emake check prefix="${S}/src" libdir="${S}/src" || die -} - -src_install() { - emake install DESTDIR="${ED}" || die - doman man/* - dodoc ChangeLog TODO - - # move crap to / for multipath-tools #325355 - gen_usr_ldscript -a aio - if ! use static-libs ; then - rm "${ED}"usr/lib*/*.a || die - fi - - # remove stuff provided by man-pages now - rm "${ED}"usr/share/man/man3/aio_{cancel,error,fsync,init,read,return,suspend,write}.* -} diff --git a/dev-libs/libaio/libaio-0.3.109-r3.ebuild b/dev-libs/libaio/libaio-0.3.109-r3.ebuild index 0438a6f1843f..9a8d0acac46f 100644 --- a/dev-libs/libaio/libaio-0.3.109-r3.ebuild +++ b/dev-libs/libaio/libaio-0.3.109-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.3 2012/03/12 07:59:59 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.4 2012/03/17 11:03:57 pacho Exp $ -EAPI="3" +EAPI=3 inherit eutils multilib toolchain-funcs @@ -45,10 +45,21 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.3.109-install.patch epatch "${FILESDIR}"/${PN}-0.3.109-x32.patch epatch "${FILESDIR}"/${PN}-0.3.109-testcase-8.patch + declare -a extra_sed + if ! use static-libs; then + extra_sed[${#extra_sed[@]}]='-e' + extra_sed[${#extra_sed[@]}]='/\tinstall .*\/libaio.a/d' + # Tests require the static library to be built. + if ! use test; then + extra_sed[${#extra_sed[@]}]='-e' + extra_sed[${#extra_sed[@]}]='/^all_targets +=/s/ libaio.a//' + fi + fi sed -i \ -e "/^libdir=/s:lib$:$(get_libdir):" \ -e "/^prefix=/s:/usr:${EPREFIX}/usr:" \ -e '/:=.*strip.*shell.*git/s:=.*:=:' \ + "${extra_sed[@]}" \ src/Makefile Makefile || die done ABI=${OABI} @@ -60,7 +71,7 @@ emake_libaio() { CC="$(tc-getCC) $(get_abi_CFLAGS)" \ AR=$(tc-getAR) \ RANLIB=$(tc-getRANLIB) \ - emake "$@" + emake "$@" || die } src_compile() { @@ -69,7 +80,7 @@ src_compile() { do einfo "Compiling ${ABI} ABI ..." cd "${WORKDIR}"/${ABI}/${P} || die - emake_libaio || die + emake_libaio done ABI=${OABI} } @@ -82,7 +93,7 @@ src_test() { cd "${WORKDIR}"/${ABI}/${P}/harness || die mkdir testdir || die # 'make check' breaks with sandbox, 'make partcheck' works - emake_libaio partcheck prefix="${S}/src" libdir="${S}/src" || die + emake_libaio partcheck prefix="${S}/src" libdir="${S}/src" done ABI=${OABI} } @@ -96,7 +107,7 @@ src_install() { # Don't use ED for emake, src_prepare already inserts EPREFIX in the correct # place - emake_libaio install DESTDIR="${D}" || die + emake_libaio install DESTDIR="${D}" if is_final_abi; then doman man/* @@ -111,10 +122,6 @@ src_install() { done ABI=${OABI} - if ! use static-libs ; then - rm "${ED}"usr/lib*/*.a || die - fi - # remove stuff provided by man-pages now - rm "${ED}"usr/share/man/man3/{lio_listio,aio_{cancel,error,fsync,init,read,return,suspend,write}}.* + rm "${ED}"usr/share/man/man3/{lio_listio,aio_{cancel,error,fsync,init,read,return,suspend,write}}.* || die } -- cgit v1.2.3-65-gdbad