From owner-svn-ports-head@freebsd.org Mon Dec 5 12:28:10 2016 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 5927DC6710D; Mon, 5 Dec 2016 12:28:10 +0000 (UTC) (envelope-from koobs@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 0F400CA2; Mon, 5 Dec 2016 12:28:09 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB5CS9OX077248; Mon, 5 Dec 2016 12:28:09 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB5CS9pE077246; Mon, 5 Dec 2016 12:28:09 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201612051228.uB5CS9pE077246@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 5 Dec 2016 12:28:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427879 - in head/devel/git: . files 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.23 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, 05 Dec 2016 12:28:10 -0000 Author: koobs Date: Mon Dec 5 12:28:08 2016 New Revision: 427879 URL: https://svnweb.freebsd.org/changeset/ports/427879 Log: devel/git: Fix build with PERL option disabled configure.ac defines a macro (GIT_ARG_SET_PATH), which takes an optional 'allow-without' parameter, which if not specified (in configure.ac), causes --without-foo/--with-foo=no not to be checked/allowed. allow-without is set for python, but not for perl in configure.ac: # Define PYTHON_PATH to provide path to Python. # GIT_ARG_SET_PATH(python, allow-without) # GIT_ARG_SET_PATH(perl) The non-presence of the optional second macro argument results in the following error when --without-perl is specified by PERL_CONFIGURE_WITH=perl=${PERL} configure:4065: error: You cannot use git without perl This error is a regression after r427505 [1], which switched from PERL_MAKE_ENV to PERL_CONFIGURE_WITH (and its associated --without-*). This change adds: * allow-without to configure.ac allowing --without-perl to work. * USES=autoreconf to regenerate configure from configure.ac. [1] https://svnweb.freebsd.org/changeset/ports/427505 PR: 215038 Approved by: portmgr (blanket) Differential Revision: D8709 Added: head/devel/git/files/patch-configure.ac (contents, props changed) Modified: head/devel/git/Makefile Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Mon Dec 5 12:21:55 2016 (r427878) +++ head/devel/git/Makefile Mon Dec 5 12:28:08 2016 (r427879) @@ -25,7 +25,7 @@ GROUPS= git_daemon SUB_FILES= pkg-message GNU_CONFIGURE= yes -USES= gmake shebangfix ssl tar:xz +USES= autoreconf gmake shebangfix ssl tar:xz CPPFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ARGS+= DEVELOPER_CFLAGS= Added: head/devel/git/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/git/files/patch-configure.ac Mon Dec 5 12:28:08 2016 (r427879) @@ -0,0 +1,14 @@ +# Specify 'allow-without' to allow --without-perl to be used +# TODO: Upstream + +--- configure.ac.orig 2016-12-04 08:23:08 UTC ++++ configure.ac +@@ -373,7 +373,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFA + GIT_ARG_SET_PATH(shell) + # + # Define PERL_PATH to provide path to Perl. +-GIT_ARG_SET_PATH(perl) ++GIT_ARG_SET_PATH(perl, allow-without) + # + # Define PYTHON_PATH to provide path to Python. + GIT_ARG_SET_PATH(python, allow-without)