2e732a738d
Skip checks on LibGit2/libgit2, file, and FileWatching.
Add "LOCALBASE=${MINGW_PREFIX}" to make command.
Make.user changes:
Add or change:
USE_SYSTEM_LIBUNWIND = 1
USE_SYSTEM_GMP = 0
USE_SYSTEM_MPFR = 0
USE_SYSTEM_ZLIB = 1
USE_SYSTEM_P7ZIP = 1
Remove:
USE_LLVM_SHLIB = 0
LOCALBASE = ${MINGW_PREFIX}
prefix = ${MINGW_PREFIX}
Add as comments:
USE_SYSTEM_OPENLIBM = 1
USE_SYSTEM_CURL = 1
Also, setting "USE_BINARYBUILDER = 0" and other USE_BINARYBUILDER_
because it is more like version 1.1.1. And, BB seems to not work right.
Change makedepends to "${MINGW_PACKAGE_PREFIX}-gcc-fortran".
Add to depends:
${MINGW_PACKAGE_PREFIX}-libunwind
${MINGW_PACKAGE_PREFIX}-openblas
Add to makedepends:
${MINGW_PACKAGE_PREFIX}-gmp
Stop applying
011-1.1.1-winnt-donot-cp-LLVM.dll-when-USE_LLVM_SHLIB-disabled.patch.
And, add patch files:
012-1.1.1-gcc-remove-USING_SJLJ_EXCEPTIONS.patch
015-1.1.1-mingw-use-O2-instead-of-O3.patch
017-1.4.1-backport-1.4.2-Add-GCC10-to-GCC-version-mappings-35849.patch
018-1.4.1-llvm-8.0.1-D64937-gcc10.patch
Edit and rename to "007-1.3.0-pkgbuild-make-install-no-build.patch".
Add but do not apply 019-1.4.1-port-nl-libgit2-v0.99.0.patch
Add _show_log_lockup_info=0 code because server does not like tty command.
29 lines
1017 B
Diff
29 lines
1017 B
Diff
From 37483b3c177f6b1018cb30d1b22e5365505e3692 Mon Sep 17 00:00:00 2001
|
|
From: Tim Stahlhut <stahta01@gmail.com>
|
|
Date: Wed, 13 May 2020 12:07:53 -0400
|
|
Subject: Add $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted target
|
|
|
|
---
|
|
deps/libgit2.mk | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/deps/libgit2.mk b/deps/libgit2.mk
|
|
index ae634542b0..5d0a90aae7 100644
|
|
--- a/deps/libgit2.mk
|
|
+++ b/deps/libgit2.mk
|
|
@@ -44,6 +44,13 @@ endif
|
|
|
|
LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR)
|
|
|
|
+$(SRCCACHE)/$(LIBGIT2_SRC_DIR)/source-extracted: $(SRCCACHE)/$(LIBGIT2_SRC_DIR).tar.gz
|
|
+ $(JLCHECKSUM) $<
|
|
+ mkdir -p $(dir $@) && \
|
|
+ $(TAR) -C $(dir $@) --strip-components 1 --exclude tests/resources/testrepo-worktree/link_to_new.txt -xf $<
|
|
+ touch -c $(SRCCACHE)/$(LIBGIT2_SRC_DIR)/CMakeLists.txt # old target
|
|
+ echo 1 > $@
|
|
+
|
|
$(LIBGIT2_SRC_PATH)/libgit2-agent-nonfatal.patch-applied: $(LIBGIT2_SRC_PATH)/source-extracted
|
|
cd $(LIBGIT2_SRC_PATH) && \
|
|
patch -p1 -f < $(SRCDIR)/patches/libgit2-agent-nonfatal.patch
|
|
--
|