Respect CFLAGS.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 30 insertions, 11 deletions

diff --git a/dev-libs/libgit2/ChangeLog b/dev-libs/libgit2/ChangeLog
index 205d9d89233d..86fd3de66b33 100644
--- a/dev-libs/libgit2/ChangeLog
+++ b/dev-libs/libgit2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libgit2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.10 2012/05/23 00:34:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/ChangeLog,v 1.11 2012/05/23 00:43:14 radhermit Exp $
+
+  23 May 2012; Tim Harder <radhermit@gentoo.org> libgit2-0.17.0.ebuild,
+  +files/libgit2-0.17.0-cflags.patch:
+  Respect CFLAGS.
 
 *libgit2-0.17.0 (23 May 2012)
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 41d58a8f3e37..9f2e404176b5 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX libgit2-0.17.0-cflags.patch 658 RMD160 e61bd1cabd14c243f07b301da3eb9df9538456f1 SHA1 1e3f8a7ae797856d5f4ddb5aeb234b2e37fc6e5b SHA256 90d0ef9f55bf7652bdb6c1c0268781b24f0c87bdcbe8a984896e51c6f8ba4a15
 DIST libgit2-0.15.0.tar.gz 978124 RMD160 0430461c227421299f5aa6bd62a1ee7e5a82e17d SHA1 3243c69134613d2c8de665a936ce08f6f18f91e2 SHA256 dc47e4fd498a39d1b90bcc5ba189e504140cb6db521dd54808b238b4662d1347
 DIST libgit2-0.16.0.tar.gz 1042613 RMD160 43aef37fc34ef4c55ea3f14b2663564ac20a34c6 SHA1 cc97920c8f751ed70a815efa7b9bfbd15d252ef0 SHA256 b84e5353ebc41e785f777a4977da9fa3eaf19f71c07eb2a2c23c2ceafb811597
 DIST libgit2-0.17.0.tar.gz 2096159 RMD160 2a8a83fc17d4d71792f34d63654a09c3b35efe9e SHA1 63cf5d19690c11d73e7951603ce8d933f88f2635 SHA256 068eed0b8fe852a7cc55aae46d2299e9c9e3e00badc1c293d72a9dd122226018
 EBUILD libgit2-0.15.0.ebuild 805 RMD160 69b2448f7b229fe53adacda772f0185e4e5b8842 SHA1 f51a9818cf6f42d254821a2166a7d82ccaaa24cc SHA256 9e5da58eba8534863ae0cb35df579944231c82816cfa587330d3063f18396701
 EBUILD libgit2-0.16.0.ebuild 895 RMD160 66c5894c52961fe2372ac4a081ddae000b1de382 SHA1 289ce3b2d56deacd5da2c5b8ab5c9088ad6d192a SHA256 ecdf998b2a5c407e1053258338e21c8b1fd25445032436ef6dfb5820f955cc22
-EBUILD libgit2-0.17.0.ebuild 896 RMD160 3d427958ff41d854f50690edc53eb7c201ca668d SHA1 bb2667a354277ca3a6e186ea477debdc78aaec99 SHA256 e35a3e366dd51881b5f451a0d620208504e68a3dab1a1efe1844cc6582b238c9
-MISC ChangeLog 1439 RMD160 bd08d6634e72ade3f83c84ecacf0ffdc195c1e7f SHA1 ae3f488838379c4abd26c3eac538af91b7be86e5 SHA256 97e4a349ace943255bd503d4e38b0c6b4f948d0477c325a10a42542f3436a78c
+EBUILD libgit2-0.17.0.ebuild 941 RMD160 a1e26a16029e974a4846d0f4ad6c241d855863f7 SHA1 4364e7fe7fd7a023e530b06e4b1737daf33666f6 SHA256 78e5e0d9e9bb0de5c0e8fc1eb93b69d678e902afe320d79118c465173357ad08
+MISC ChangeLog 1568 RMD160 01f48522b2b79124f490a878d88d13b6d813bd3e SHA1 1e04a206593dc86232366556a0ce47123257118a SHA256 1a847ecada465eca61bafb2c2842ad6c08dcddab52fc6bbc98ddd17f0d5e6776
 MISC metadata.xml 518 RMD160 012e9d294c8e8a1e65b151da14bacebec46e13c0 SHA1 1d266ff9a22b6cf438b039237a4da62cecb1c1e0 SHA256 0cee5ccd29e738742a9e67c0f56de98559c969f57a27f9a5c449b46e36cb3da4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPvDCHAAoJEEqz6FtPBkyjkLMH/ROb0ztMwsiN4wcLvSQHmH44
-21tMl4EV5vJECJR/vxmWMCYW0YKR+NerGKC56NL1IIxklR59hN/gMRtcWQBRcyFP
-1QLCogE/UsTGSZle5f0RuZhcx0huXesSPQqx9FZQeiiQx59tvoQRAr6Mrh/U/EZv
-BarrjkUFnyRQdKg1c8UPFg9m4frgWgUbt0RPWcBBoI/XwrUJdNrg8qicYO9Vkx81
-c5BsLYT1qpH0AmqTjotC1YUvTfgvHc1JuCiT2Jq+Q4n1jzuW+LC7KLEaG5w6eDSQ
-WBtQ1Br4YmZ63Xq5Poxe4ElvG0vY7nbYErJlr1GhXhmT0QLbfiXdXxvsUW0EnaM=
-=aN6a
+iQEcBAEBCgAGBQJPvDKoAAoJEEqz6FtPBkyjnK4IAI2zbqQxEY2bVIenKWI606Bl
+FJU58Wl/hAihfstu5VLuf/rsPQrz/2QuzQgDKv4X9D++FJ/sH4NnIOlUnPkzcNhD
+vHnuXe0dyp3otyiSxSxuHwX7gKUQrJdLCwi9Ft90nT3i8loEqO0suTyFKl0S40NA
+BUCpWTpxx31XaFIpwVzgkHqOSzxq7xZv5wKVgU6G4AwOBCLp/A1BvBqlCKGtO+Du
+4Pxa8eG6lQV+AYDV/6nZqDi6rYN+OlTSxupCEwv11x1wSY5I8vl4X94EMJzMqR6f
+cDqh21Q336lrdYmE2XtwxLx3PpXgTmnGwPvE0c92tZsz592+ZhCkqc17WxcbDCY=
+=2FNS
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgit2/files/libgit2-0.17.0-cflags.patch b/dev-libs/libgit2/files/libgit2-0.17.0-cflags.patch
new file mode 100644
index 000000000000..fbf760038de1
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-0.17.0-cflags.patch
@@ -0,0 +1,12 @@
+--- libgit2-0.17.0/CMakeLists.txt
++++ libgit2-0.17.0/CMakeLists.txt
+@@ -70,8 +70,7 @@
+ 
+    # Precompiled headers
+ ELSE ()
+-	SET(CMAKE_C_FLAGS "-O2 -g -D_GNU_SOURCE -fvisibility=hidden -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
+-	SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
++	SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
+ 	IF (NOT MINGW) # MinGW always does PIC and complains if we tell it to
+ 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ 	ENDIF ()
diff --git a/dev-libs/libgit2/libgit2-0.17.0.ebuild b/dev-libs/libgit2/libgit2-0.17.0.ebuild
index a146d70542da..b7f4cfa65eb6 100644
--- a/dev-libs/libgit2/libgit2-0.17.0.ebuild
+++ b/dev-libs/libgit2/libgit2-0.17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/libgit2-0.17.0.ebuild,v 1.1 2012/05/23 00:34:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/libgit2-0.17.0.ebuild,v 1.2 2012/05/23 00:43:14 radhermit Exp $
 
 EAPI=4
 
@@ -20,6 +20,8 @@ DEPEND="${RDEPEND}"
 
 DOCS=( README.md )
 
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_LIB="${EPREFIX}/usr/$(get_libdir)"