From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 281AB198005 for ; Wed, 6 Mar 2013 07:13:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF58FE0534; Wed, 6 Mar 2013 07:13:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D3B1E0534 for ; Wed, 6 Mar 2013 07:13:31 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D5FF33DD72 for ; Wed, 6 Mar 2013 07:13:30 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2274) id 001A32171D; Wed, 6 Mar 2013 07:13:28 +0000 (UTC) From: "Tim Harder (radhermit)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, radhermit@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-libs/canlock: canlock-2b.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: canlock-2b.ebuild ChangeLog X-VCS-Directories: net-libs/canlock X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130306071329.001A32171D@flycatcher.gentoo.org> Date: Wed, 6 Mar 2013 07:13:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ab592b1d-a764-4bc7-80df-a036630e2a9b X-Archives-Hash: dc26746cf32c6c07571c5fce69254917 radhermit 13/03/06 07:13:28 Modified: canlock-2b.ebuild ChangeLog Log: Fix linking issue (bug #446746). (Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) Revision Changes Path 1.4 net-libs/canlock/canlock-2b.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/canlock-2b.ebuild?r1=1.3&r2=1.4 Index: canlock-2b.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- canlock-2b.ebuild 10 Oct 2011 18:35:03 -0000 1.3 +++ canlock-2b.ebuild 6 Mar 2013 07:13:28 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v 1.3 2011/10/10 18:35:03 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/canlock-2b.ebuild,v 1.4 2013/03/06 07:13:28 radhermit Exp $ EAPI=4 @@ -25,7 +25,12 @@ } src_compile() { - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + local targets="shared" + if use static-libs || use test ; then + targets+=" static" + fi + + emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets} } src_install() { 1.5 net-libs/canlock/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/canlock/ChangeLog?r1=1.4&r2=1.5 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 24 Aug 2012 21:59:07 -0000 1.4 +++ ChangeLog 6 Mar 2013 07:13:28 -0000 1.5 @@ -1,6 +1,10 @@ # ChangeLog for net-libs/canlock -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.4 2012/08/24 21:59:07 radhermit Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/canlock/ChangeLog,v 1.5 2013/03/06 07:13:28 radhermit Exp $ + + 06 Mar 2013; Tim Harder canlock-2b.ebuild, + files/canlock-2b-make.patch: + Fix linking issue (bug #446746). 24 Aug 2012; Tim Harder files/canlock-2b-make.patch: Respect cflags and ldflags (bug #432622).