cb3a0177ef
git fails to build with NLS enabled because of weak check for gettext in configure.ac. The AC_CHECK_LIB(c, gettext ...) is used to set LIBC_CONTAINS_LIBINTL variable. If the variable is set then '-libs' is not passed to the linker, but this variable is set to 'Yes' even libc implementation does not provide libintl support, the AC_CHECK passes because gcc has gettext builtin. So use instead AC_LINK_IFELSE with included libintl.h because it makes gettext to unfold as libintl_gettext which causes AC_CHECK to fail for cases when gettext is not provided by libc. Tested by ./utils/test-pkg with NLS disabled/enabled. Fixes: http://autobuild.buildroot.net/results/091b790ca6f5b46d5d29211dc1cb3ff05b62a965 http://autobuild.buildroot.net/results/a69b58b35b270fdd2df9b076e7030bb594520197 http://autobuild.buildroot.net/results/f104c4e6ff41b1dd175f2d27f3b4ea7c9b61f7c5 http://autobuild.buildroot.net/results/ee12bdba398a139995de5f6f6718be6a493541d9 http://autobuild.buildroot.net/results/74fa6b2bfbb1301e35c9dd1bbc04856c1cbf25f2 Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
78 lines
2.0 KiB
Makefile
78 lines
2.0 KiB
Makefile
################################################################################
|
|
#
|
|
# git
|
|
#
|
|
################################################################################
|
|
|
|
GIT_VERSION = 2.16.5
|
|
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_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
|
|
GIT_AUTORECONF = YES
|
|
|
|
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 ifeq ($(BR2_PACKAGE_PCRE),y)
|
|
GIT_DEPENDENCIES += pcre
|
|
GIT_CONF_OPTS += --with-libpcre1
|
|
GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
|
|
else
|
|
GIT_CONF_OPTS += --without-libpcre
|
|
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=/usr/lib
|
|
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_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))
|