Skip to content

Commit 0b2008e

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
1 parent ddbfe0b commit 0b2008e

File tree

10 files changed

+10
-9
lines changed

10 files changed

+10
-9
lines changed

contrib/src/basu/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ basu: basu-$(BASU_VERSION).tar.gz .sum-basu
2626
.basu: basu crossfile.meson
2727
rm -rf $</build
2828
$(HOSTVARS_MESON) $(MESON) $</build $<
29-
meson install -C $</build
29+
$(MESONBUILD)
3030
touch $@

contrib/src/dav1d/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
2828
.dav1d: dav1d crossfile.meson
2929
rm -rf $</build
3030
$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
31-
meson install -C $</build
31+
$(MESONBUILD)
3232
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
@@ -32,5 +32,5 @@ endif
3232
.harfbuzz: harfbuzz crossfile.meson
3333
rm -rf $</build
3434
$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
35-
meson install -C $</build
35+
$(MESONBUILD)
3636
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/libplacebo/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif
4747
.libplacebo: libplacebo crossfile.meson
4848
rm -rf $</build
4949
$(HOSTVARS_MESON) $(MESON) $(PLACEBOCONF) $</build $<
50-
meson install -C $</build
50+
$(MESONBUILD)
5151
# Work-around for full paths to static libraries, which libtool does not like
5252
# See https://github.com/mesonbuild/meson/issues/5479
5353
(cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-rewrite-absolute.py -i "$(PREFIX)/lib/pkgconfig/libplacebo.pc")

contrib/src/librist/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist
3535
.librist: librist crossfile.meson
3636
rm -rf $</build
3737
$(HOSTVARS_MESON) $(MESON) $(LIBRIST_CONF) $</build $<
38-
meson install -C $</build
38+
$(MESONBUILD)
3939
touch $@

contrib/src/main.mak

+1
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
497497
else
498498
MESON = meson $(MESONFLAGS)
499499
endif
500+
MESONBUILD = meson install -C $</build
500501

501502
ifdef GPL
502503
REQUIRE_GPL =

contrib/src/medialibrary/rules.mak

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 .sum-medialibrary
2020
.medialibrary: medialibrary crossfile.meson
2121
rm -rf $</build
2222
$(HOSTVARS_MESON) $(MESON) -Dlibvlc=disabled -Dlibtool_workaround=true $</build $<
23-
meson install -C $</build
23+
$(MESONBUILD)
2424
touch $@
2525

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)