diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-09-13 12:09:46 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-09-13 12:09:46 +0000 |
| commit | c1182ab3b54aa569fb55989544086b1e00909fa5 (patch) | |
| tree | d9eaf9184435d3167a77e4add9d47f934b5542c7 /media-libs/glfw | |
| parent | Fix small patch problem (diff) | |
| download | historical-c1182ab3b54aa569fb55989544086b1e00909fa5.tar.gz historical-c1182ab3b54aa569fb55989544086b1e00909fa5.tar.bz2 historical-c1182ab3b54aa569fb55989544086b1e00909fa5.zip | |
Respect LDFLAGS. Bug #336991
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'media-libs/glfw')
| -rw-r--r-- | media-libs/glfw/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/glfw/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/glfw/files/glfw-2.6-ldflags.patch | 21 | ||||
| -rw-r--r-- | media-libs/glfw/glfw-2.6.ebuild | 12 |
4 files changed, 37 insertions, 7 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/Manifest b/media-libs/glfw/Manifest index 6ea607b6bb30..85ed1f75bace 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,5 +1,6 @@ AUX glfw-2.6-dyn.patch 963 RMD160 229a187f27ff461a36687b2db6df1924e1cb3e08 SHA1 1f0bbd12751282ba43c94992383a1072a164be9e SHA256 bb91028d524ea357407bc91d4b09db0568e237954109f8fa5db2973ec449fbdd +AUX glfw-2.6-ldflags.patch 467 RMD160 e9d39a9034cdd85d0f63f3d1022bd95293a776c7 SHA1 052f00da824a165095d74d76e089ead3d28b513d SHA256 b484dc94e838d696056d0008fb5e3d40a531a41408b3aa006d8ad955f1b5c67b DIST glfw-2.6.tar.bz2 886843 RMD160 71c767e16167e8460fbfb01391614b2501247c7e SHA1 7b11e5a9d923c9826d4cc6eeeb441dc6940109c8 SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca -EBUILD glfw-2.6.ebuild 1839 RMD160 44bf560220b576d7ad0b742c0a87b9f0adcc9f62 SHA1 911a4a9e1d4719a55ab9fee321a62d74ed9b9fc5 SHA256 f0f0b5c8ae2ad8a1ccddeffd338fcc182d0fc286b9cff47f39c27a2c7bdb687c -MISC ChangeLog 1670 RMD160 5e8739f97c5774c23508509c60f72f5bf5e463c0 SHA1 cd07499a04610df201d32bc5b70dd2b671ef56a6 SHA256 f360ab5a4ee78cf7b3775ce66cb1c7b1154dc2ca1c23dbe19576c9481f6bc489 +EBUILD glfw-2.6.ebuild 1876 RMD160 cbd6b06aa053ad545f068c0950a0c3b3308bca0e SHA1 af3cd8b05a2497f611bf937f7ffc8c7aca2b1297 SHA256 4f9a38b311d3e703f8a3b5e85add1dff2bd22c336cb8f6c6bfbfe9890b21893e +MISC ChangeLog 1824 RMD160 6a8690d1a7922cdba2da2933bb167f2d94d3f5e4 SHA1 c01f168d05763e2dae163d47c4b08c4350e72223 SHA256 ed419b25125eb10035a41e551a695202952aaa320f664296be6633101acebbe3 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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() { |