From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 11 19:20:04 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E97D902 for ; Tue, 11 Mar 2014 19:20:04 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3AD89249 for ; Tue, 11 Mar 2014 19:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BJK4Bh080374 for ; Tue, 11 Mar 2014 19:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2BJK4Th080373; Tue, 11 Mar 2014 19:20:04 GMT (envelope-from gnats) Resent-Date: Tue, 11 Mar 2014 19:20:04 GMT Resent-Message-Id: <201403111920.s2BJK4Th080373@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 088A347E; Tue, 11 Mar 2014 19:10:56 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B5D8A14D; Tue, 11 Mar 2014 19:10:55 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WNS4W-0004tF-JA; Tue, 11 Mar 2014 23:10:40 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 3D8E7707; Tue, 11 Mar 2014 23:10:40 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 3364BB230; Tue, 11 Mar 2014 23:10:40 +0400 (MSK) Message-Id: <20140311191040.3364BB230@hades.panopticon> Date: Tue, 11 Mar 2014 23:10:40 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187454: [PATCH] devel/git: fix build on 10.x with libiconv from ports installed Cc: wxs@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Mar 2014 19:20:04 -0000 >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@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: