summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-11-17 14:49:24 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-11-17 14:49:24 +0000
commit54cc7006a10011220f95f776f51d3386f75c4b83 (patch)
tree49436e0840b15ab58255e31ce5de764d70ce8b8d /media-libs/libdc1394
parentkeyword ~amd64-fbsd, bug #489436 (diff)
downloadgentoo-2-54cc7006a10011220f95f776f51d3386f75c4b83.tar.gz
gentoo-2-54cc7006a10011220f95f776f51d3386f75c4b83.tar.bz2
gentoo-2-54cc7006a10011220f95f776f51d3386f75c4b83.zip
fix build failure wrt #488716
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'media-libs/libdc1394')
-rw-r--r--media-libs/libdc1394/ChangeLog6
-rw-r--r--media-libs/libdc1394/libdc1394-2.2.1.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 21a598a54c93..14a6c928659c 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libdc1394
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.70 2013/08/11 15:01:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.71 2013/11/17 14:49:24 hasufell Exp $
+
+ 17 Nov 2013; Julian Ospald <hasufell@gentoo.org> libdc1394-2.2.1.ebuild:
+ fix build failure wrt #488716
*libdc1394-2.2.1 (11 Aug 2013)
@@ -388,4 +391,3 @@
11 Oct 2003; Hanno Boeck <hanno@gentoo.org> libdc1394-0.9.1.ebuild:
Ebuild submitted by Stephen Edwards <sed@flashmail.com>.
-
diff --git a/media-libs/libdc1394/libdc1394-2.2.1.ebuild b/media-libs/libdc1394/libdc1394-2.2.1.ebuild
index 5abe7aa6528f..b46f45c55eea 100644
--- a/media-libs/libdc1394/libdc1394-2.2.1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.1 2013/08/11 15:01:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.2 2013/11/17 14:49:24 hasufell Exp $
EAPI=5
@@ -21,12 +21,16 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
+src_prepare() {
+ multilib_copy_sources
+}
+
multilib_src_configure() {
local myconf="$(use_enable doc doxygen-html)"
multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples"
# X is only useful for examples that are not installed.
- ECONF_SOURCE="${S}" econf \
+ econf \
$(use_enable static-libs static) \
--program-suffix=2 \
--without-x \