From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 6 16:40:05 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AC031065671 for ; Tue, 6 May 2008 16:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 09FB68FC1B for ; Tue, 6 May 2008 16:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m46Ge4he003149 for ; Tue, 6 May 2008 16:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m46Ge4B9003148; Tue, 6 May 2008 16:40:04 GMT (envelope-from gnats) Resent-Date: Tue, 6 May 2008 16:40:04 GMT Resent-Message-Id: <200805061640.m46Ge4B9003148@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, Dan Nelson Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A96E1065671 for ; Tue, 6 May 2008 16:37:32 +0000 (UTC) (envelope-from dan@dan.emsphone.com) Received: from dan.emsphone.com (dan.emsphone.com [199.67.51.101]) by mx1.freebsd.org (Postfix) with ESMTP id D61B68FC2C for ; Tue, 6 May 2008 16:37:31 +0000 (UTC) (envelope-from dan@dan.emsphone.com) Received: from dan.emsphone.com (smmsp@localhost [127.0.0.1]) by dan.emsphone.com (8.14.2/8.14.2) with ESMTP id m46G56JT011618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 6 May 2008 11:05:07 -0500 (CDT) (envelope-from dan@dan.emsphone.com) Received: (from dan@localhost) by dan.emsphone.com (8.14.3/8.14.2/Submit) id m46G560B011616; Tue, 6 May 2008 11:05:06 -0500 (CDT) (envelope-from dan) Message-Id: <200805061605.m46G560B011616@dan.emsphone.com> Date: Tue, 6 May 2008 11:05:06 -0500 (CDT) From: Dan Nelson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/123469: [PATCH] net/rsync: fix WITHOUT_ICONV build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2008 16:40:05 -0000 >Number: 123469 >Category: ports >Synopsis: [PATCH] net/rsync: fix WITHOUT_ICONV build >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 06 16:40:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dan Nelson >Release: FreeBSD 7.0-STABLE i386 >Organization: The Allant Group >Environment: System: FreeBSD dan.emsphone.com 7.0-STABLE FreeBSD 7.0-STABLE #546: Thu May 1 13:34:56 CDT 2008 zsh@dan.emsphone.com:/usr/src-7/sys/i386/compile/DANSMP i386 >Description: The options dialog lets you ask for iconv support to be disabled, but just adding --disable-iconv isn't enough. That simply disables rsync's --iconv flag but still allows libiconv to be linked into the binary... >How-To-Repeat: Install libiconv, uncheck "Add iconv support" in the rsync options screen, build rsync. The link stage will fail with: rsync.o(.text+0xffe): In function `iconvbufs': : undefined reference to `libiconv' rsync.o(.text+0x1132): In function `iconvbufs': : undefined reference to `libiconv' rsync.o(.text+0x11b8): In function `setup_iconv': : undefined reference to `locale_charset' rsync.o(.text+0x11de): In function `setup_iconv': : undefined reference to `libiconv_open' *** Error code 1 >Fix: Set the appropriate autoconf cache variables so that rsync's configure script completely skips iconv detection, even if it's present on the system. As a bonus, no post-configure fixup is needed: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/rsync/Makefile,v retrieving revision 1.131 diff -u -r1.131 Makefile --- Makefile 8 Apr 2008 19:24:06 -0000 1.131 +++ Makefile 6 May 2008 15:28:33 -0000 @@ -55,6 +55,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" .else CONFIGURE_ARGS+= --disable-iconv +CONFIGURE_ENV+= ac_cv_search_libiconv_open=no +CONFIGURE_ENV+= ac_cv_header_iconv_h=no .endif .if defined(WITH_FLAGS) @@ -71,7 +73,7 @@ .if defined(WITH_POPT_PORT) LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" .else CONFIGURE_ARGS+= --with-included-popt @@ -91,11 +93,6 @@ @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ ${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h -.if defined(WITHOUT_ICONV) -post-configure: - @${REINPLACE_CMD} -e 's|-liconv||' ${WRKSRC}/Makefile -.endif - post-install: @${STRIP_CMD} ${PREFIX}/bin/rsync @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/ >Release-Note: >Audit-Trail: >Unformatted: