aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-22 14:34:58 +0530
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-08-22 14:34:58 +0530
commitd91d0bb69774d5a6c19b2cbe7ff9a70aadc7f072 (patch)
tree98552de6565aacf4bfa11c7ad728337b1309f84f
parent714d16524d9597add090c37b77ba6d5d3cbfe0c5 (diff)
parentce17a364e7c74077d96f6e7573876db6666dd867 (diff)
Imported fix for libgit2 on macOS, no conflicts
There were no conflicts in this merge.
-rw-r--r--.file-metadatabin6349 -> 7194 bytes
-rw-r--r--reproduce/software/make/high-level.mk6
2 files changed, 5 insertions, 1 deletions
diff --git a/.file-metadata b/.file-metadata
index a6a476c..4059058 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index a17e989..0120675 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -559,12 +559,16 @@ $(ibidir)/yaml: $(tdir)/yaml-$(yaml-version).tar.gz
# libraries at runtime can be extremely problematic.". This is a major
# problem we have been having so far with Mac systems:
# https://libgit2.org/docs/guides/build-and-link
+# On macOS system, `libgit2' complains about not finding `_iconv*'
+# functions! But apparently `libgit2' has its own implementation of libiconv
+# that it uses if it can't find libiconv on macOS. So, to fix this problem
+# it is necessary to use the option `-DUSE_ICONV=OFF` in the configure step.
$(ibidir)/libgit2: $(tdir)/libgit2-$(libgit2-version).tar.gz \
$(ibidir)/cmake \
$(ibidir)/curl
$(call cbuild, $<, libgit2-$(libgit2-version), static, \
-DUSE_SSH=OFF -DBUILD_CLAR=OFF \
- -DTHREADSAFE=ON ) \
+ -DTHREADSAFE=ON -DUSE_ICONV=OFF ) \
&& if [ x$(on_mac_os) = xyes ]; then \
install_name_tool -id $(ildir)/libgit2.28.dylib \
$(ildir)/libgit2.28.dylib; \