[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/, dev-vcs/git/files/

["Joshua Kinard" <kumba@gentoo.org>]

commit:     e7c87c71a93aade54a574d2d11738019654029cd
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 23:15:32 2015 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 23:15:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c87c71

Fix #493306, where libiconv.so was merged into FreeBSd's libc in 10.x.  Without, git attempts to use -liconv during linking, which will fail on Gentoo/FreeBSD 10.x installs.

Package-Manager: portage-2.2.20.1

 dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch | 14 ++++++++++++++
 dev-vcs/git/git-2.5.1.ebuild                            |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
new file mode 100644
index 0000000..a874236
--- /dev/null
+++ b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
@@ -0,0 +1,14 @@
+diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
+--- git-2.5.1.orig/config.mak.uname	2015-08-28 15:37:13.000000000 -0400
++++ git-2.5.1/config.mak.uname	2015-09-06 18:54:28.538437000 -0400
+@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
+ 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
+ endif
+ ifeq ($(uname_S),FreeBSD)
+-	NEEDS_LIBICONV = YesPlease
++	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
++		NEEDS_LIBICONV = YesPlease
++	endif
+ 	OLD_ICONV = YesPlease
+ 	NO_MEMMEM = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include

diff --git a/dev-vcs/git/git-2.5.1.ebuild b/dev-vcs/git/git-2.5.1.ebuild
index 352b93a..cf36860 100644
--- a/dev-vcs/git/git-2.5.1.ebuild
+++ b/dev-vcs/git/git-2.5.1.ebuild
@@ -229,6 +229,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+
 	epatch_user
 
 	sed -i \