Skip to content
This repository was archived by the owner on Aug 19, 2019. It is now read-only.

Fix up gitdir pointers in submodules on broken git versions. #82

Merged
igorpeshansky merged 1 commit into from
Mar 19, 2018
Merged

Fix up gitdir pointers in submodules on broken git versions. #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ YAML_CPP_DIR=$(LIBDIR)/yaml-cpp
YAML_CPP_LIBDIR=$(YAML_CPP_DIR)
SUBMODULE_DIRS=$(CPP_NETLIB_DIR) $(YAML_CPP_DIR)

GIT=git
GIT_VERSION=$(shell $(GIT) --version | grep -oh '[0-9]\+\.[0-9]\+\.[0-9]\+')

SED_I=/usr/bin/env sed -i
CMAKE=cmake
CXXFLAGS=\
Expand Down Expand Up @@ -142,6 +145,18 @@ purge: clean

init-submodules:
git submodule update --init --recursive $(SUBMODULE_DIRS)
ifneq ($(findstring $(GIT_VERSION),2.7.0 2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.8.0 2.8.1 2.8.2 2.8.3),)
# Git submodule recursive init was broken between 2.7.0 and 2.8.4
# (see https://marc.info/?l=git&m=145935867502974).
# Ubuntu Xenial comes with git 2.7.4.
@echo 'Fixing submodules for git $(GIT_VERSION)'
cd $(CPP_NETLIB_DIR) && $(SED_I) -e 's@/src/.git/@../../../../.git/@' \
deps/*/.git
cd $(NETWORK_URI_DIR) && $(SED_I) -e 's@/src/.git/@../../../../../../.git/@' \
deps/*/.git
cd $(CPP_NETLIB_DIR) && $(SED_I) -e 's@/src/.git/@../../../../../../../.git/@' \
libs/network/doc/_ext/breathe/.git
endif
touch init-submodules

$(CPP_NETLIB_DIR)/Makefile: init-submodules
Expand Down