Date: Fri, 20 Jun 2025 20:53:50 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4c0966afb849 - main - devel/git: Fix build if devel/libsysinfo is installed Message-ID: <202506202053.55KKropL049967@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c0966afb84958f86b404979b174703b548fba6c commit 4c0966afb84958f86b404979b174703b548fba6c Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2025-06-20 20:44:09 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-06-20 20:49:37 +0000 devel/git: Fix build if devel/libsysinfo is installed Add option SYSINFO - default off. While here fix warning: Warning: www/p5-CGI was in Perl CORE. Check with `corelist CGI 0` and `corelist -a CGI` if it should be conditionally added depending on PERL_LEVEL PR: 287680 Approved by: garga (maintainer) --- devel/git/Makefile | 8 ++++++-- devel/git/files/patch-configure.ac | 21 +++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index aaca14d836ad..12b9fc972980 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -71,7 +71,7 @@ CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no .if ${SUBPORT} == core OPTIONS_DEFINE= CONTRIB CURL DOCS GITWEB ICONV NLS PCRE2 PERL SEND_EMAIL \ - SUBTREE + SUBTREE SYSINFO OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE . if ${FLAVOR:U} == lite @@ -93,6 +93,7 @@ GITWEB_DESC= Install gitweb PCRE2_DESC= Use Perl Compatible Regular Expressions (v2) SEND_EMAIL_DESC=Enable the git-send-email(1) script SUBTREE_DESC= Install git-subtree +SYSINFO_DESC= Use libsysinfo NLS_USES= gettext NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes @@ -104,7 +105,6 @@ PERL_RUN_DEPENDS= p5-Error>=0:lang/p5-Error PERL_MAKE_ARGS_OFF= NO_PERL=1 GITWEB_IMPLIES= PERL -GITWEB_RUN_DEPENDS= p5-CGI>=0:www/p5-CGI GITWEB_MAKE_ARGS_OFF= NO_GITWEB=1 PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 @@ -127,6 +127,10 @@ DOCS_DISTFILES= ${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX} SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \ xmlto:textproc/xmlto +SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo +SYSINFO_CONFIGURE_ON= --with-libsysinfo +SYSINFO_LDFLAGS= -lsysinfo + .else NO_ARCH= yes diff --git a/devel/git/files/patch-configure.ac b/devel/git/files/patch-configure.ac index 188508a0a19e..d75441bb721f 100644 --- a/devel/git/files/patch-configure.ac +++ b/devel/git/files/patch-configure.ac @@ -1,9 +1,9 @@ # Specify 'allow-without' to allow --without-perl to be used # TODO: Upstream ---- configure.ac.orig 2018-04-02 17:44:04 UTC +--- configure.ac.orig 2025-06-16 05:42:57 UTC +++ configure.ac -@@ -414,7 +414,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFAULT_EDITOR, +@@ -396,7 +396,7 @@ GIT_ARG_SET_PATH(shell) GIT_ARG_SET_PATH(shell) # # Define PERL_PATH to provide path to Perl. @@ -12,3 +12,20 @@ # # Define PYTHON_PATH to provide path to Python. GIT_ARG_SET_PATH(python, allow-without) +@@ -1070,6 +1070,8 @@ GIT_CONF_SUBST([CHARSET_LIB]) + # + # Define HAVE_SYSINFO=YesPlease if sysinfo is available. + # ++AC_ARG_WITH(libsysinfo, ++AS_HELP_STRING([--with-libsysinfo],[support libsysinfo (default is NO)]), + AC_DEFUN([HAVE_SYSINFO_SRC], [ + AC_LANG_PROGRAM([[ + #include <stdint.h> +@@ -1091,6 +1093,7 @@ AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC], + HAVE_SYSINFO=YesPlease], + [AC_MSG_RESULT([no]) + HAVE_SYSINFO=]) ++) + GIT_CONF_SUBST([HAVE_SYSINFO]) + + #home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506202053.55KKropL049967>