From owner-svn-ports-head@freebsd.org Mon Dec 7 04:29:45 2015 Return-Path: Delivered-To: svn-ports-head@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 876189A06FA; Mon, 7 Dec 2015 04:29:45 +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 55DCC1A1B; Mon, 7 Dec 2015 04:29:45 +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 tB74Ti4n088195; Mon, 7 Dec 2015 04:29:44 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB74TigR088194; Mon, 7 Dec 2015 04:29:44 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201512070429.tB74TigR088194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 7 Dec 2015 04:29:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403177 - head/devel/cgit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2015 04:29:45 -0000 Author: adamw Date: Mon Dec 7 04:29:44 2015 New Revision: 403177 URL: https://svnweb.freebsd.org/changeset/ports/403177 Log: Add NO_R_TO_GCC_LINKER=1 to MAKE_ARGS, which tells the bundled git to use -Wl,-rpath=/path/ instead of -R/path/. This occurs when USE_OPENSSL_PORT=yes is defined in /etc/make.conf, exposed by the changes in r403176. Modified: head/devel/cgit/Makefile Modified: head/devel/cgit/Makefile ============================================================================== --- head/devel/cgit/Makefile Mon Dec 7 03:58:06 2015 (r403176) +++ head/devel/cgit/Makefile Mon Dec 7 04:29:44 2015 (r403177) @@ -25,7 +25,7 @@ SHEBANG_FILES= filters/html-converters/r CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ARGS+= CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \ - prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 + prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME}