summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-05-23 00:43:14 +0000
committerTim Harder <radhermit@gentoo.org>2012-05-23 00:43:14 +0000
commit950e0bb0237458581db3f14067d9d96e29119248 (patch)
tree402b297a93bf138d5aa6e16301cfcb6dcd8dcf6d /dev-libs/libgit2
parentVersion bump. (diff)
downloadgentoo-2-950e0bb0237458581db3f14067d9d96e29119248.tar.gz
gentoo-2-950e0bb0237458581db3f14067d9d96e29119248.tar.bz2
gentoo-2-950e0bb0237458581db3f14067d9d96e29119248.zip
Respect CFLAGS.
(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libgit2')
-rw-r--r--dev-libs/libgit2/ChangeLog6
-rw-r--r--dev-libs/libgit2/files/libgit2-0.17.0-cflags.patch12
-rw-r--r--dev-libs/libgit2/libgit2-0.17.0.ebuild4
3 files changed, 20 insertions, 2 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/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)"