mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-19 08:13:21 +00:00
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
This commit is contained in:
parent
4146a4443d
commit
166d69ddc5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=427879
@ -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=
|
||||
|
14
devel/git/files/patch-configure.ac
Normal file
14
devel/git/files/patch-configure.ac
Normal file
@ -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)
|
Loading…
Reference in New Issue
Block a user