Skip to content

Commit c4bb5e3

Browse files
committed
contrib: add MESONBUILD similar to CMAKEBUILD
We don't use the '+' in front because it doesn't use the jobserver from our make call, because of ninja: ninja-build/ninja#1139 (cherry picked from commit 0b2008e) (edited) edited: - DCMAKE_VERBOSE_MAKEFILE is placed differently on 3.0 - 3.0 doesn't build libplacebo with meson - 3.0 doesn't have basu - 3.0 doesn't have librist - 3.0 doesn't have medialibrary
1 parent b0330f9 commit c4bb5e3

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

contrib/src/dav1d/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
2323
.dav1d: dav1d crossfile.meson
2424
rm -rf $</build
2525
$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
26-
meson install -C $</build
26+
$(MESONBUILD)
2727
touch $@

contrib/src/fribidi/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
2020
.fribidi: fribidi crossfile.meson
2121
rm -rf $</build
2222
$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false $</build $<
23-
meson install -C $</build
23+
$(MESONBUILD)
2424
touch $@

contrib/src/harfbuzz/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ endif
3434
.harfbuzz: harfbuzz crossfile.meson
3535
rm -rf $</build
3636
$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
37-
meson install -C $</build
37+
$(MESONBUILD)
3838
touch $@

contrib/src/libdsm/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ endif
2929
.libdsm: libdsm crossfile.meson
3030
rm -rf $</build
3131
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false $</build $<
32-
meson install -C $</build
32+
$(MESONBUILD)
3333
touch $@

contrib/src/main.mak

+1
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBD
450450
else
451451
MESON = meson $(MESONFLAGS)
452452
endif
453+
MESONBUILD = meson install -C $</build
453454

454455
ifeq ($(V),1)
455456
CMAKE += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

contrib/src/microdns/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
2424
.microdns: microdns crossfile.meson
2525
rm -rf $</build
2626
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled $</build $<
27-
meson install -C $</build
27+
$(MESONBUILD)
2828
touch $@

0 commit comments

Comments
 (0)