Skip to content

Commit 0ef4dc5

Browse files
committed
build: checkout submodules in the right version
When run make git-update, this will checkout the submodule for the especified version.
1 parent dfd8dbf commit 0ef4dc5

File tree

7 files changed

+41
-7
lines changed

7 files changed

+41
-7
lines changed

build/m4/brotli.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# Brotli
33
#
4+
BROTLI_GIT_VERSION:=v1.0.9
5+
46
build/lib/brotli/js/decode.js: build/lib/brotli/configured
57
build/lib/brotli/js/polyfill.js: build/lib/brotli/configured
68
build/lib/brotli/configured: lib/brotli $(wildcard $(BASE_DIR)build/patches/brotli/*.patch)
@@ -37,4 +39,7 @@ git-brotli:
3739
cd lib/brotli && \
3840
git reset --hard && \
3941
git clean -dfx && \
40-
git pull origin master
42+
git fetch origin && \
43+
git checkout $(BROTLI_GIT_VERSION) && \
44+
git submodule sync --recursive && \
45+
git submodule update --init --recursive

build/m4/expat.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# Expat
33
#
4+
EXPAT_GIT_VERSION:=R_2_4_1
5+
46
build/lib/expat/configured: lib/expat
57
mkdir -p build/lib/expat
68
touch build/lib/expat/configured
@@ -31,4 +33,7 @@ git-expat:
3133
cd lib/expat && \
3234
git reset --hard && \
3335
git clean -dfx && \
34-
git pull origin master
36+
git fetch origin && \
37+
git checkout $(EXPAT_GIT_VERSION) && \
38+
git submodule sync --recursive && \
39+
git submodule update --init --recursive

build/m4/fontconfig.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# Fontconfig
33
#
4+
FONTCONFIG_GIT_VERSION:=2.13.94
5+
46
build/lib/fontconfig/configure: lib/fontconfig $(wildcard $(BASE_DIR)build/patches/fontconfig/*.patch)
57
rm -rf build/lib/fontconfig
68
cp -r lib/fontconfig build/lib/fontconfig
@@ -34,4 +36,7 @@ git-fontconfig:
3436
cd lib/fontconfig && \
3537
git reset --hard && \
3638
git clean -dfx && \
37-
git pull origin master
39+
git fetch origin && \
40+
git checkout $(FONTCONFIG_GIT_VERSION) && \
41+
git submodule sync --recursive && \
42+
git submodule update --init --recursive

build/m4/freetype.mk

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Freetype
33
#
4+
FREETYPE_GIT_VERSION:=VER-2-11-0
45

56
## Without Harfbuzz (Bootstrap)
67
build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotlidec.a $(wildcard $(BASE_DIR)build/patches/freetype/*.patch)
@@ -66,4 +67,7 @@ git-freetype:
6667
cd lib/freetype && \
6768
git reset --hard && \
6869
git clean -dfx && \
69-
git pull origin master
70+
git fetch origin && \
71+
git checkout $(FREETYPE_GIT_VERSION) && \
72+
git submodule sync --recursive && \
73+
git submodule update --init --recursive

build/m4/fribidi.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# Fribidi
33
#
4+
FRIBIDI_GIT_VERSION:=v1.0.10
5+
46
build/lib/fribidi/configure: lib/fribidi $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch)
57
rm -rf build/lib/fribidi
68
mkdir -p build/lib
@@ -34,4 +36,7 @@ git-fribidi:
3436
cd lib/fribidi && \
3537
git reset --hard && \
3638
git clean -dfx && \
37-
git pull origin master
39+
git fetch origin && \
40+
git checkout $(FRIBIDI_GIT_VERSION) && \
41+
git submodule sync --recursive && \
42+
git submodule update --init --recursive

build/m4/harfbuzz.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# Harfbuzz
33
#
4+
HARFBUZZ_GIT_VERSION:=2.8.2
5+
46
build/lib/harfbuzz/configure: lib/harfbuzz $(wildcard $(BASE_DIR)build/patches/harfbuzz/*.patch)
57
rm -rf build/lib/harfbuzz
68
cp -r lib/harfbuzz build/lib/harfbuzz
@@ -48,4 +50,7 @@ git-harfbuzz:
4850
cd lib/harfbuzz && \
4951
git reset --hard && \
5052
git clean -dfx && \
51-
git pull origin master
53+
git fetch origin && \
54+
git checkout $(HARFBUZZ_GIT_VERSION) && \
55+
git submodule sync --recursive && \
56+
git submodule update --init --recursive

build/m4/libass.mk

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#
22
# libass
33
#
4+
LIBASS_GIT_VERSION:=643829edd8408ec37182a04040fe5a7bf54dccc3
5+
46
build/lib/libass/configured: lib/libass
57
rm -rf build/lib/libass
68
cd lib/libass && NOCONFIGURE=1 ./autogen.sh
@@ -34,4 +36,7 @@ git-libass:
3436
cd lib/libass && \
3537
git reset --hard && \
3638
git clean -dfx && \
37-
git pull origin master
39+
git fetch origin && \
40+
git checkout $(LIBASS_GIT_VERSION) && \
41+
git submodule sync --recursive && \
42+
git submodule update --init --recursive

0 commit comments

Comments
 (0)