ports/187454: [PATCH] devel/git: fix build on 10.x with libiconv from ports installed

[Dmitry Marakasov]

>Number:         187454
>Category:       ports
>Synopsis:       [PATCH] devel/git: fix build on 10.x with libiconv from ports installed
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 11 19:20:03 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
On 10.x, with libiconv from ports installed, git doesn't build as
it detectes and uses locale_charset() function from ports' libiconv,
but -liconv is not passed to linker because iconv functionality is
built into libc.

Fix this by adding -liconv to library list. This works in all
libiconv setups (system, ports and system+ports).

The same fix was sent upstream:
http://www.mail-archive.com/git@vger.kernel.org/msg45490.html

Port maintainer (wxs at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.03 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- git-1.9.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 347902)
+++ Makefile	(working copy)
@@ -24,6 +24,7 @@
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USES=		gmake shebangfix
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: files/patch-configure.ac
===================================================================
--- files/patch-configure.ac	(revision 0)
+++ files/patch-configure.ac	(working copy)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2014-03-11 21:52:06.068444421 +0400
++++ configure.ac	2014-03-11 21:52:29.280443652 +0400
+@@ -890,7 +890,7 @@
+ # and libcharset does
+ CHARSET_LIB=
+ AC_CHECK_LIB([iconv], [locale_charset],
+-       [],
++       [CHARSET_LIB=-liconv],
+        [AC_CHECK_LIB([charset], [locale_charset],
+                      [CHARSET_LIB=-lcharset])])
+ GIT_CONF_SUBST([CHARSET_LIB])

Property changes on: files/patch-configure.ac
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- git-1.9.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: