summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-01-19 15:55:46 +0000
committerJustin Lecher <jlec@gentoo.org>2012-01-19 15:55:46 +0000
commit84f24b2f00a5f8beafadcdea6f8c55f099da7308 (patch)
treefbe622d2d35587b4d3ca94b34045be99012b5e8f /sci-libs/ccolamd
parentFixed PYTHON_DEPEND (diff)
downloadgentoo-2-84f24b2f00a5f8beafadcdea6f8c55f099da7308.tar.gz
gentoo-2-84f24b2f00a5f8beafadcdea6f8c55f099da7308.tar.bz2
gentoo-2-84f24b2f00a5f8beafadcdea6f8c55f099da7308.zip
Don't run elibtoolize twice, #399299; build out off source fixed
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/ccolamd')
-rw-r--r--sci-libs/ccolamd/ChangeLog8
-rw-r--r--sci-libs/ccolamd/ccolamd-2.7.3.ebuild15
-rw-r--r--sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch2
3 files changed, 10 insertions, 15 deletions
diff --git a/sci-libs/ccolamd/ChangeLog b/sci-libs/ccolamd/ChangeLog
index 5d151317998f..18a6cc7ef6ef 100644
--- a/sci-libs/ccolamd/ChangeLog
+++ b/sci-libs/ccolamd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/ccolamd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ChangeLog,v 1.22 2011/12/23 02:04:34 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ChangeLog,v 1.23 2012/01/19 15:55:46 jlec Exp $
+
+ 19 Jan 2012; Justin Lecher <jlec@gentoo.org>
+ files/ccolamd-2.7.1-autotools.patch, ccolamd-2.7.3.ebuild:
+ Don't run elibtoolize twice, #399299; build out off source fixed
23 Dec 2011; Jeroen Roovers <jer@gentoo.org> ccolamd-2.7.3.ebuild:
Stable for HPPA (bug #393945).
diff --git a/sci-libs/ccolamd/ccolamd-2.7.3.ebuild b/sci-libs/ccolamd/ccolamd-2.7.3.ebuild
index 5cdb36a9307d..475236da4b6e 100644
--- a/sci-libs/ccolamd/ccolamd-2.7.3.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ccolamd-2.7.3.ebuild,v 1.7 2011/12/23 02:04:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccolamd/ccolamd-2.7.3.ebuild,v 1.8 2012/01/19 15:55:46 jlec Exp $
EAPI=4
@@ -24,13 +24,4 @@ DOCS=( README.txt Doc/ChangeLog )
S="${WORKDIR}/${MY_PN}"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.1-autotools.patch
- )
-
-src_prepare() {
- autotools-utils_src_prepare
- eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.7.1-autotools.patch )
diff --git a/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch b/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch
index 6b8b069dec7a..baf3a48240fe 100644
--- a/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch
+++ b/sci-libs/ccolamd/files/ccolamd-2.7.1-autotools.patch
@@ -23,7 +23,7 @@
--- Source/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ Source/Makefile.am 2008-01-29 18:53:56.000000000 +0000
@@ -0,0 +1,10 @@
-+AM_CPPFLAGS = -I$(top_builddir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include
+lib_LTLIBRARIES = libccolamd.la
+noinst_LTLIBRARIES = libccolamdl.la libccolamdi.la
+