diff options
author | Jeroen Roovers <jer@gentoo.org> | 2013-03-15 18:17:12 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2013-03-15 18:17:12 +0000 |
commit | 603725a1eb92c9d48e19d50a075991ab3ab5be6b (patch) | |
tree | 77117cd5e49776d3a96f0a5142e26efb59695b41 /dev-libs/dmalloc | |
parent | Fixed manifest (contained a .rej file) (diff) | |
download | gentoo-2-603725a1eb92c9d48e19d50a075991ab3ab5be6b.tar.gz gentoo-2-603725a1eb92c9d48e19d50a075991ab3ab5be6b.tar.bz2 gentoo-2-603725a1eb92c9d48e19d50a075991ab3ab5be6b.zip |
Respect AR. Clean up patches.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-libs/dmalloc')
-rw-r--r-- | dev-libs/dmalloc/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild (renamed from dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild) | 38 | ||||
-rw-r--r-- | dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch | 5 | ||||
-rw-r--r-- | dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch | 11 | ||||
-rw-r--r-- | dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch | 5 | ||||
-rw-r--r-- | dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch | 4 |
6 files changed, 51 insertions, 22 deletions
diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog index 5540534891d7..15a93b143d3c 100644 --- a/dev-libs/dmalloc/ChangeLog +++ b/dev-libs/dmalloc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/dmalloc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.67 2013/02/07 21:50:56 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.68 2013/03/15 18:17:12 jer Exp $ + +*dmalloc-5.5.2-r5 (15 Mar 2013) + + 15 Mar 2013; Jeroen Roovers <jer@gentoo.org> -dmalloc-5.5.2-r3.ebuild, + +dmalloc-5.5.2-r5.ebuild, files/dmalloc-5.5.2-Makefile.in.patch, + +files/dmalloc-5.5.2-ar.patch, files/dmalloc-5.5.2-cxx.patch, + files/dmalloc-5.5.2-threads.patch: + Respect AR. Clean up patches. 07 Feb 2013; Ulrich Müller <ulm@gentoo.org> dmalloc-5.5.2-r3.ebuild, dmalloc-5.5.2-r4.ebuild: diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild index d679c1c779cc..a66b5c4d3186 100644 --- a/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild +++ b/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r3.ebuild,v 1.9 2013/02/07 21:50:56 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r5.ebuild,v 1.1 2013/03/15 18:17:12 jer Exp $ -EAPI="3" - -inherit autotools eutils multilib +EAPI=5 +inherit autotools eutils multilib toolchain-funcs DESCRIPTION="A Debug Malloc Library" HOMEPAGE="http://dmalloc.com" @@ -12,12 +11,14 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="threads" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="static-libs threads" DEPEND="sys-apps/texinfo" RDEPEND="" +DOCS=( NEWS README docs/NOTES docs/TODO ) + src_prepare() { # - Build objects twice, once -fPIC for shared. # - Use DESTDIR. @@ -25,35 +26,38 @@ src_prepare() { epatch "${FILESDIR}"/${P}-Makefile.in.patch # - Broken test, always returns false. epatch "${FILESDIR}"/${P}-cxx.patch + epatch "${FILESDIR}"/${P}-ar.patch # - Add threads support. use threads && epatch "${FILESDIR}"/${P}-threads.patch # Respect CFLAGS/LDFLAGS. #337429 sed -i Makefile.in \ -e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \ + -e 's|ar cr|$(AR) cr|g' \ || die "sed Makefile.in" # - Run autoconf for -cxx.patch. eautoconf } src_configure() { - econf --enable-cxx --enable-shlib \ - $(use_enable threads) || die "econf failed!" + tc-export AR + econf --enable-cxx --enable-shlib $(use_enable threads) } src_compile() { - emake || die "emake failed!" - cd docs && makeinfo dmalloc.texi + default + + cd docs + makeinfo dmalloc.texi || die } src_test() { - emake heavy || die "emake check failed!" + emake heavy } src_install() { - emake DESTDIR="${D}" install || die "emake install failed!" + default newdoc ChangeLog.1 ChangeLog - dodoc NEWS README docs/NOTES docs/TODO insinto /usr/share/doc/${PF} doins docs/dmalloc.pdf dohtml RELEASE.html docs/dmalloc.html @@ -61,7 +65,15 @@ src_install() { # add missing symlinks, lazy dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*} + for lib in cxx th thcxx; do dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so + dosym lib${PN}${lib}.so.${PV} \ + /usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*} done + + if ! use static-libs; then + rm "${D}"/usr/$(get_libdir)/lib${PN}*.a || die + fi } diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch index 70e6e11062cd..92b232eb58e9 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch @@ -1,6 +1,5 @@ -diff -ur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in ---- dmalloc-5.5.2.orig/Makefile.in 2007-05-14 20:26:14.000000000 +0300 -+++ dmalloc-5.5.2/Makefile.in 2007-12-27 19:23:54.000000000 +0200 +--- a/Makefile.in ++++ b/Makefile.in @@ -41,7 +41,7 @@ # thread version of the library diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch new file mode 100644 index 000000000000..56be2fa3ef4e --- /dev/null +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-ar.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -131,7 +132,7 @@ + AC_MSG_CHECKING([shared library link args]) + AC_COMPILE_IFELSE([ int foo(int val) { return val + 1; } ],[ + # so now we try to create an archive from the compiled .o file +- (ar cr conftest.a conftest.o) 2>&5 ++ ($AR cr conftest.a conftest.o) 2>&5 + # see which shared-library ld commands work + # + # Darwin/Mac OS X - Terry Teague diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch index c4d0b22f9c0a..0fa01e105c53 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch @@ -1,6 +1,5 @@ -diff -ur dmalloc-5.5.2.orig/configure.ac dmalloc-5.5.2/configure.ac ---- dmalloc-5.5.2.orig/configure.ac 2007-05-14 20:26:14.000000000 +0300 -+++ dmalloc-5.5.2/configure.ac 2007-12-27 18:13:18.000000000 +0200 +--- a/configure.ac ++++ b/configure.ac @@ -55,11 +55,12 @@ AC_PROG_CC AC_PROG_CXX diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch index 4016be0a21c0..c3cbd90aa9f5 100644 --- a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch +++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch @@ -1,5 +1,5 @@ ---- ./dmalloc-5.5.2/settings.dist.orig 2008-09-23 09:24:56.000000000 +0200 -+++ ./dmalloc-5.5.2/settings.dist 2008-09-23 09:25:27.000000000 +0200 +--- a/settings.dist ++++ b/settings.dist @@ -409,7 +409,7 @@ */ |