From owner-svn-ports-all@freebsd.org Wed Dec 23 22:56:48 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0038DA4FBDC; Wed, 23 Dec 2015 22:56:47 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8C7F1F19; Wed, 23 Dec 2015 22:56:47 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNMukIs007967; Wed, 23 Dec 2015 22:56:46 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNMukWr007966; Wed, 23 Dec 2015 22:56:46 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201512232256.tBNMukWr007966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Wed, 23 Dec 2015 22:56:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404326 - head/shells/zsh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2015 22:56:48 -0000 Author: adamw Date: Wed Dec 23 22:56:46 2015 New Revision: 404326 URL: https://svnweb.freebsd.org/changeset/ports/404326 Log: Partially revert r403755. It can't build the curses module against ncurses from ports. It probably can, but configure is too smart to figure that out. I have no confidence that linking against curses from ports results in a properly working zshell. So, for now, back out the change. It will build a shared lib zsh against ncurses from ports, but breaks statically-linked zsh's. Mark the port as IGNORE if we're using ncurses from ports and building a static zsh. Also, remove a regression-test target that isn't useful anymore (thanks to bapt for the reminder about this). I am not enthused about this change. It doesn't really "fix" the below PR, so much as shoot ourselves in the other foot instead. PR: 205500 Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Wed Dec 23 21:28:01 2015 (r404325) +++ head/shells/zsh/Makefile Wed Dec 23 22:56:46 2015 (r404326) @@ -41,7 +41,7 @@ TEST_TARGET= test CPPFLAGS+= -I${LOCALBASE}/include -DBOOL_DEFINED LDFLAGS+= -L${LOCALBASE}/lib -Wl,--as-needed CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no -CONFIGURE_ARGS= --with-term-lib="tinfow tinfo" --with-tcsetpgrp \ +CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \ --enable-function-subdirs --enable-multibyte \ --sysconfdir=${PREFIX}/etc @@ -86,6 +86,10 @@ DEBUG_CONFIGURE_ENABLE= zsh-debug CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif +.if (${NCURSESBASE} == ${LOCALBASE}) && ${PORT_OPTIONS:MSTATIC} +IGNORE= cannot statically link against ncurses from ports. Either deinstall the ncurses port or turn off the STATIC option +.endif + post-patch: @${REINPLACE_CMD} -i '' -e '1s|zsh|${zsh_CMD}|' ${WRKSRC}/Functions/Misc/run-help-ip @${REINPLACE_CMD} -e '/LIBS/s/-lrt//' ${WRKSRC}/configure @@ -133,7 +137,4 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) -regression-test: - @(cd ${WRKSRC}; ${SETENV} -i ${MAKE} check) - .include