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 8C3BE138860 for ; Mon, 4 Feb 2013 20:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 145CDE01DC; Mon, 4 Feb 2013 20:28:43 +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 9325BE01DC for ; Mon, 4 Feb 2013 20:28:42 +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 8930F33DE33 for ; Mon, 4 Feb 2013 20:28:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 665) id 4D2552171D; Mon, 4 Feb 2013 20:28:40 +0000 (UTC) From: "Michael Sterrett (mr_bones_)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mr_bones_@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/glfw: glfw-2.7.7.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: glfw-2.7.7.ebuild ChangeLog X-VCS-Directories: media-libs/glfw X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130204202840.4D2552171D@flycatcher.gentoo.org> Date: Mon, 4 Feb 2013 20:28:40 +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: 8ae7ec37-ad4c-4bdf-94a3-9dd65660fa4c X-Archives-Hash: 65e20ca7d4ff46bf3e2f7ec74255b60c mr_bones_ 13/02/04 20:28:40 Modified: glfw-2.7.7.ebuild ChangeLog Log: add static-libs support (bug #442752) (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) Revision Changes Path 1.2 media-libs/glfw/glfw-2.7.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild?r1=1.1&r2=1.2 Index: glfw-2.7.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glfw-2.7.7.ebuild 19 Nov 2012 20:48:37 -0000 1.1 +++ glfw-2.7.7.ebuild 4 Feb 2013 20:28:40 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v 1.1 2012/11/19 20:48:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v 1.2 2013/02/04 20:28:40 mr_bones_ Exp $ EAPI=5 inherit eutils multilib toolchain-funcs @@ -12,7 +12,7 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples" +IUSE="examples static-libs" DEPEND="x11-libs/libX11 x11-libs/libXrandr @@ -23,22 +23,26 @@ src_prepare() { sed -i \ -e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \ - readme.html \ - || die "sed failed" + readme.html || die epatch "${FILESDIR}"/${P}-{dyn,pkgconfig}.patch # respect ldflags sed -i \ -e "s/\$(LFLAGS)/\$(LDFLAGS) \$(LFLAGS)/" \ - {lib/x11,examples}/Makefile.x11.in || die "sed Makefile.x11.in failed" + {lib/x11,examples}/Makefile.x11.in || die # respect cflags in linking command # build system is messing up CFLAGS variable, so sed is the easy way to go sed -i \ -e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \ - lib/x11/Makefile.x11.in \ - || die "sed Makefile.x11.in failed" + lib/x11/Makefile.x11.in || die + + if use !static-libs ; then + sed -i \ + -e '/^all:/s/libglfw.a//' \ + lib/x11/Makefile.x11.in || die + fi } src_configure() { @@ -51,7 +55,7 @@ } src_install() { - dolib.a lib/x11/libglfw.a + use static-libs && dolib.a lib/x11/libglfw.a dolib.so lib/x11/libglfw.so.2.7.7 dosym libglfw.so.2.7.7 /usr/$(get_libdir)/libglfw.so 1.16 media-libs/glfw/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/glfw/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 19 Nov 2012 20:48:37 -0000 1.15 +++ ChangeLog 4 Feb 2013 20:28:40 -0000 1.16 @@ -1,6 +1,9 @@ # ChangeLog for media-libs/glfw -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.15 2012/11/19 20:48:37 hasufell Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.16 2013/02/04 20:28:40 mr_bones_ Exp $ + + 04 Feb 2013; Michael Sterrett glfw-2.7.7.ebuild: + add static-libs support (bug #442752) *glfw-2.7.7 (19 Nov 2012)