[gentoo-commits] gentoo-x86 commit in media-libs/glfw: glfw-2.7.7.ebuild ChangeLog

["Michael Sterrett (mr_bones_)" <mr_bones_@gentoo.org>]

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 <mr_bones_@gentoo.org> glfw-2.7.7.ebuild:
+  add static-libs support (bug #442752)
 
 *glfw-2.7.7 (19 Nov 2012)