summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-09-13 12:09:46 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-09-13 12:09:46 +0000
commit8fb53da3fce68176a342c7bc4f8bb8c1d61f5448 (patch)
tree898987c7df90d2ed0adfc31fd194e8e48e1736a4 /media-libs/glfw
parentFix small patch problem (diff)
downloadgentoo-2-8fb53da3fce68176a342c7bc4f8bb8c1d61f5448.tar.gz
gentoo-2-8fb53da3fce68176a342c7bc4f8bb8c1d61f5448.tar.bz2
gentoo-2-8fb53da3fce68176a342c7bc4f8bb8c1d61f5448.zip
Respect LDFLAGS. Bug #336991
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'media-libs/glfw')
-rw-r--r--media-libs/glfw/ChangeLog6
-rw-r--r--media-libs/glfw/files/glfw-2.6-ldflags.patch21
-rw-r--r--media-libs/glfw/glfw-2.6.ebuild12
3 files changed, 34 insertions, 5 deletions
diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog
index 5aad72bedb12..2d90a355f493 100644
--- a/media-libs/glfw/ChangeLog
+++ b/media-libs/glfw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/glfw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.11 2010/01/05 13:35:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.12 2010/09/13 12:09:46 tupone Exp $
+
+ 13 Sep 2010; Tupone Alfredo <tupone@gentoo.org> glfw-2.6.ebuild,
+ +files/glfw-2.6-ldflags.patch:
+ Respect LDFLAGS. Bug #336991 by flameeyes@gentoo.org
05 Jan 2010; <hwoarang@gentoo.org> glfw-2.6.ebuild:
Stable on amd64 wrt bug #283955
diff --git a/media-libs/glfw/files/glfw-2.6-ldflags.patch b/media-libs/glfw/files/glfw-2.6-ldflags.patch
new file mode 100644
index 000000000000..3fcebe503d71
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.6-ldflags.patch
@@ -0,0 +1,21 @@
+--- compile.sh.old 2010-09-13 13:51:19.000000000 +0200
++++ compile.sh 2010-09-13 13:51:34.000000000 +0200
+@@ -85,7 +85,7 @@
+ case "x`uname 2> /dev/null`" in
+ xLinux)
+ CFLAGS="$CFLAGS -Dlinux"
+- LDFLAGS="-shared"
++ LDFLAGS="${LDFLAGS} -shared"
+ echo " Linux" 1>&6
+ ;;
+ xDarwin)
+--- compile.sh.old 2010-09-13 13:58:07.000000000 +0200
++++ compile.sh 2010-09-13 13:58:20.000000000 +0200
+@@ -65,7 +65,6 @@
+
+ CFLAGS=
+ LFLAGS=
+-LDFLAGS=
+ INCS=
+ LIBS="-lGL -lX11"
+
diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild
index 1e051d1f59d7..bfc650c93dad 100644
--- a/media-libs/glfw/glfw-2.6.ebuild
+++ b/media-libs/glfw/glfw-2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.5 2010/01/05 13:35:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.6 2010/09/13 12:09:46 tupone Exp $
EAPI=2
inherit eutils multilib
@@ -24,12 +24,16 @@ src_prepare() {
-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
readme.html \
|| die "sed failed"
- epatch "${FILESDIR}/${P}"-dyn.patch
+ epatch "${FILESDIR}/${P}"-dyn.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+ sh ./compile.sh
}
src_compile() {
- emake x11 || die "emake failed"
- emake -C lib/x11 PREFIX=/usr -f Makefile.x11 libglfw.pc || die "emake libglfw.pc failed"
+ emake -C lib/x11 PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed"
}
src_install() {