diff options
Diffstat (limited to 'devel/git/files/patch-configure.ac')
-rw-r--r-- | devel/git/files/patch-configure.ac | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/devel/git/files/patch-configure.ac b/devel/git/files/patch-configure.ac index 35ed793fa5c4..37c1d7ac2a2a 100644 --- a/devel/git/files/patch-configure.ac +++ b/devel/git/files/patch-configure.ac @@ -12,78 +12,3 @@ # # Define PYTHON_PATH to provide path to Python. GIT_ARG_SET_PATH(python, allow-without) -@@ -1068,32 +1068,6 @@ GIT_CONF_SUBST([CHARSET_LIB]) - GIT_CONF_SUBST([CHARSET_LIB]) - - # --# Define HAVE_SYSINFO=YesPlease if sysinfo is available. --# --AC_DEFUN([HAVE_SYSINFO_SRC], [ --AC_LANG_PROGRAM([[ --#include <stdint.h> --#include <sys/sysinfo.h> --]], [[ --struct sysinfo si; --uint64_t t = 0; --if (!sysinfo(&si)) { -- t = si.totalram; -- if (si.mem_unit > 1) -- t *= (uint64_t)si.mem_unit; --} --return t; --]])]) -- --AC_MSG_CHECKING([for sysinfo]) --AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC], -- [AC_MSG_RESULT([yes]) -- HAVE_SYSINFO=YesPlease], -- [AC_MSG_RESULT([no]) -- HAVE_SYSINFO=]) --GIT_CONF_SUBST([HAVE_SYSINFO]) -- --# - # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available. - GIT_CHECK_FUNC(clock_gettime, - [HAVE_CLOCK_GETTIME=YesPlease], -@@ -1220,6 +1194,41 @@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL]) - [AC_MSG_RESULT([no]) - HAVE_BSD_SYSCTL=]) - GIT_CONF_SUBST([HAVE_BSD_SYSCTL]) -+ -+# -+# Define HAVE_SYSINFO=YesPlease if sysinfo is available. -+# -+ -+HAVE_SYSINFO= -+# on a *BSD system, sysctl() takes precedence over the -+# sysinfo() compatibility library (if installed). -+ -+if test -z "$HAVE_BSD_SYSCTL"; then -+ -+ AC_DEFUN([HAVE_SYSINFO_SRC], [ -+ AC_LANG_PROGRAM([[ -+ #include <stdint.h> -+ #include <sys/sysinfo.h> -+ ]], [[ -+ struct sysinfo si; -+ uint64_t t = 0; -+ if (!sysinfo(&si)) { -+ t = si.totalram; -+ if (si.mem_unit > 1) -+ t *= (uint64_t)si.mem_unit; -+ } -+ return t; -+ ]])]) -+ -+ AC_MSG_CHECKING([for sysinfo]) -+ AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC], -+ [AC_MSG_RESULT([yes]) -+ HAVE_SYSINFO=YesPlease], -+ [AC_MSG_RESULT([no]) -+ HAVE_SYSINFO=]) -+ GIT_CONF_SUBST([HAVE_SYSINFO]) -+ -+fi - - ## Other checks. - # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link. |