diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-11-14 23:31:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-11-14 23:31:45 +0000 |
| commit | b6ab1fcd34f6e904a2baa3b450fb406526ad88a1 (patch) | |
| tree | 6bc952a0375faccee606a2ba17781031426a32a1 /media-libs/glfw | |
| parent | respect flags, CC and stuff wrt #443164 (diff) | |
| download | historical-b6ab1fcd34f6e904a2baa3b450fb406526ad88a1.tar.gz historical-b6ab1fcd34f6e904a2baa3b450fb406526ad88a1.tar.bz2 historical-b6ab1fcd34f6e904a2baa3b450fb406526ad88a1.zip | |
respect CFLAGS, CC, AR and whatnot wrt #442740
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'media-libs/glfw')
| -rw-r--r-- | media-libs/glfw/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/glfw/Manifest | 20 | ||||
| -rw-r--r-- | media-libs/glfw/glfw-2.6.ebuild | 19 |
3 files changed, 37 insertions, 7 deletions
diff --git a/media-libs/glfw/ChangeLog b/media-libs/glfw/ChangeLog index 1321fc19b53a..0d3437c929b2 100644 --- a/media-libs/glfw/ChangeLog +++ b/media-libs/glfw/ChangeLog @@ -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.13 2012/10/18 20:35:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/ChangeLog,v 1.14 2012/11/14 23:31:43 hasufell Exp $ + + 14 Nov 2012; Julian Ospald <hasufell@gentoo.org> glfw-2.6.ebuild: + respect CFLAGS, CC, AR and whatnot wrt #442740 18 Oct 2012; Michael Sterrett <mr_bones_@gentoo.org> glfw-2.6.ebuild: add virtual/glu dep (bug #438828) diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest index bfe66a8e23ef..d7257fa9e42d 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,6 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX glfw-2.6-dyn.patch 963 SHA256 bb91028d524ea357407bc91d4b09db0568e237954109f8fa5db2973ec449fbdd SHA512 1716466639351ee89cc69c156708e7ccdabb558caf38273d666c601d4bda0f4592f458b8b3ed70b0d022f176ef422be60304ca5df8ee177eeb28c16267d02c87 WHIRLPOOL 32b0b2ce0718a47356efe5219dda8fade0f7f28d30004be7441eab82e042dcd618c2c00d5b3af22991c4d59bfa64be81da40d9423ba7a85c31326a42f4a1fe04 AUX glfw-2.6-ldflags.patch 467 SHA256 b484dc94e838d696056d0008fb5e3d40a531a41408b3aa006d8ad955f1b5c67b SHA512 8b1b1e98c01f6d7ff4e0265bf89a431176a285e1b529392ac47327bfb18d6ff674136649b0ae4c981c9287c84ca557c0a9bc997a278aaa008d84a2a7cdc36411 WHIRLPOOL 96c15b29aa9edcbb51c0f03c6c7e55ef0411a6883904e46feb1016074da254459941e6f16a89bd57295d1e1d4b78e0f2cdc330bd3da0be68c4b18cc82874ac7d -DIST glfw-2.6.tar.bz2 886843 SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca -EBUILD glfw-2.6.ebuild 1892 SHA256 48535e555c94f9d421e488c5ca565e3e55bf9f943f0e8bb37b9f69f6b7e55a71 SHA512 f24f55000bf44661db08d1d8bbbf397c231e02b809c091d701d584e6d6edfcad2605a833b352fb81b401049115d03f61db8e0c4169e97b26929b3453097eec89 WHIRLPOOL 9936c297653a0a46e710dc4fd40b13a090f0aeb5f38654096c998289746fcd6fcfa9d86073113ae431df4226df2310700fe257697a76359ab81f6f1dbfcc6a97 -MISC ChangeLog 1935 SHA256 307b0d0468312278128cb7da9bc5ec03317de90032b6e46733e90d92604fc3af SHA512 5fcc29a19b241d4e06fe0551980a594b728d5098f90ae654136826fe5682b1f4ea905036c6aad1abeea786da7caf6c23a9b5bee05c89b9238604fe9aa0c844d3 WHIRLPOOL 1b25e4249df370882aace7e9a6ad4fba68b1af911f88e386aa3f4efe05deb25633ae8e3249960133f77249d906b89bd14245e77abfbe8086c6d5ae7ad74605fb +DIST glfw-2.6.tar.bz2 886843 SHA256 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca SHA512 4161b6f447c245f982f779da9ca790a91f4bebbffbe4ea024220d856311ebf8d5755ce4481b8667bcb964ea58ce689019ee09c004f69f81df53ee834e6792163 WHIRLPOOL 24ada131512368a7e3f696b2accd3b1ee0df0948eb977df2de3ba932d7c1378d951b2aa9d48d7e8d4c1497c0ee5a8617e79904952ac6d7ca547af69ec4117dcd +EBUILD glfw-2.6.ebuild 2225 SHA256 2d29b729d97eecd17b39cbfb13bf1b63678eb5334ac62c93db694c4583e0ca11 SHA512 8f6737ec219eebecefb57b2568d1e45115e88b0533582d7c3276c745c08465545f772f4f4bd7b29e7c886d967aeb5635f4d55ba7eb7756e90ea6bbc3295f69c1 WHIRLPOOL 095d656685dd4b574c30ae0793641e1c820652f1e285dd8baf0be8581dab0eca1ada4ba6698eaae101756632f21970a181ae24643f74b42ec90a0c77a8f910ca +MISC ChangeLog 2052 SHA256 ee0a7f8a02434817d95a6426ac987ee6816af785f6936fb76be8411bcaf36ffe SHA512 e44037f957a69d842354482705bdec38333140974bc58b91d0e3fd7132b62c3145ad0defb1ed3919df6f7263e8db38f0dd7b6412a672c4f3c0c0bbd076be32ba WHIRLPOOL 45f962a9e446130fba97b82f563c01f2eef5d752dab5bb75971098661ecef3af7c4ab4b309814bce9117d7850dcc46f8af32075484e809e0e1689e62be423b71 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQpCnhAAoJEFpvPKfnPDWzalsH/jwrOhxKjZUEdlrq9QhNZ4cv +HogGcrfL4QvSaYDE5jH4IRX870lgycu4ZBpdN3Akjn9tcRg+HUWHDJwp0hUEbB+V +YxLzvBHOwuKP74GLjucKEY9cra0Aepj9yZa8JOeQXcZU6hz4RiOGpQxr3/F5MwTe +cDYs1qJpmcs+hKbghT+p2GsIE+pdhSTLEAGVXHDONZN80LqoW1wCtX6Pdxe3c3b/ +QQWMArBHcs4kZGCKLgy5TCujmkp/Gqq1bLB6CwKs5dRV+9yzZ9xhc6nlBvSi3j1T +MMwIwk19Ept9+YQHq7Otjmi0NgXSpb1Q7biuyKTefkjZ15JV7heon1qb0k6JJWI= +=o/oA +-----END PGP SIGNATURE----- diff --git a/media-libs/glfw/glfw-2.6.ebuild b/media-libs/glfw/glfw-2.6.ebuild index 247554ba8091..dfd67946d712 100644 --- a/media-libs/glfw/glfw-2.6.ebuild +++ b/media-libs/glfw/glfw-2.6.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 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.7 2012/10/18 20:35:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.8 2012/11/14 23:31:43 hasufell Exp $ EAPI=2 -inherit eutils multilib +inherit eutils multilib toolchain-funcs DESCRIPTION="The Portable OpenGL FrameWork" HOMEPAGE="http://glfw.sourceforge.net/" @@ -25,8 +25,21 @@ src_prepare() { -e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \ readme.html \ || die "sed failed" + + # respect cflags + sed -i \ + -e "/CFLAGS/s#-Os#${CFLAGS}#" \ + compile.sh \ + || die "sed compile.sh failed" + epatch "${FILESDIR}/${P}"-dyn.patch \ "${FILESDIR}"/${P}-ldflags.patch + + # respect cflags in linking command as well + sed -i \ + -e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \ + lib/x11/Makefile.x11.in \ + || die "sed Makefile.x11.in failed" } src_configure() { @@ -34,7 +47,7 @@ src_configure() { } src_compile() { - emake -C lib/x11 PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed" + emake -C lib/x11 AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr -f Makefile.x11 default libglfw.pc || die "emake failed" } src_install() { |