a6105112e8
The git package in Buildroot is quite lagging behind (v2.31.4, released on July 12, 2022 while the baseline v2.31.0 was released on March 15, 2021). Bump the package to v2.39.0 (released December 12, 2022). While at it, also replace patch fixing uclibc no threads build with two patches cherry-picked from upstream next branch, which fixes the same issue by fixing the handling of flockfile(), funlockfile(), and getc_unlocked() declarations. These patches missed the release but planned for next maintenance release (v2.39.1). The reason for replacing the patch is when original fix patch was upstreamed [1], Jeff King noted that the build failure root cause was flockfile() is defined regardless of whether uclibc is configured with threads support or not [2]. Release notes for v2.39.0 is available on release announcement on Git mailing list at [3]. [1]: https://lore.kernel.org/git/20221125092339.29433-1-bagasdotme@gmail.com/ [2]: https://lore.kernel.org/git/Y4RAr04vS%2FTOM5uh@coredump.intra.peff.net/ [3]: https://lore.kernel.org/git/xmqqlencspnl.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
84 lines
2.1 KiB
Makefile
84 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# git
|
|
#
|
|
################################################################################
|
|
|
|
GIT_VERSION = 2.39.0
|
|
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
|
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
|
|
GIT_LICENSE = GPL-2.0, LGPL-2.1+
|
|
GIT_LICENSE_FILES = COPYING LGPL-2.1
|
|
GIT_CPE_ID_VENDOR = git-scm
|
|
GIT_SELINUX_MODULES = apache git xdg
|
|
GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
GIT_DEPENDENCIES += host-pkgconf openssl
|
|
GIT_CONF_OPTS += --with-openssl
|
|
GIT_MAKE_OPTS += LIB_4_CRYPTO="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
|
|
else
|
|
GIT_CONF_OPTS += --without-openssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_PCRE2),y)
|
|
GIT_DEPENDENCIES += pcre2
|
|
GIT_CONF_OPTS += --with-libpcre2
|
|
else
|
|
GIT_CONF_OPTS += --without-libpcre2
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
|
GIT_DEPENDENCIES += libcurl
|
|
GIT_CONF_OPTS += --with-curl
|
|
GIT_CONF_ENV += \
|
|
ac_cv_prog_CURL_CONFIG=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS)
|
|
else
|
|
GIT_CONF_OPTS += --without-curl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_EXPAT),y)
|
|
GIT_DEPENDENCIES += expat
|
|
GIT_CONF_OPTS += --with-expat
|
|
else
|
|
GIT_CONF_OPTS += --without-expat
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
|
GIT_DEPENDENCIES += libiconv
|
|
GIT_CONF_ENV_LIBS += -liconv
|
|
GIT_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr
|
|
GIT_CONF_ENV += ac_cv_iconv_omits_bom=no
|
|
else
|
|
GIT_CONF_OPTS += --without-iconv
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_TCL),y)
|
|
GIT_DEPENDENCIES += tcl
|
|
GIT_CONF_OPTS += --with-tcltk
|
|
else
|
|
GIT_CONF_OPTS += --without-tcltk
|
|
endif
|
|
|
|
ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
|
|
GIT_MAKE_OPTS += NO_GETTEXT=1
|
|
endif
|
|
|
|
GIT_CFLAGS = $(TARGET_CFLAGS)
|
|
|
|
ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),)
|
|
GIT_CFLAGS += -O0
|
|
endif
|
|
|
|
GIT_CONF_OPTS += CFLAGS="$(GIT_CFLAGS)"
|
|
|
|
GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
|
|
|
|
# assume yes for these tests, configure will bail out otherwise
|
|
# saying error: cannot run test program while cross compiling
|
|
GIT_CONF_ENV += \
|
|
ac_cv_fread_reads_directories=yes \
|
|
ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)'
|
|
|
|
$(eval $(autotools-package))
|