Skip to content

Commit

Permalink
contrib: add MESONBUILD similar to CMAKEBUILD
Browse files Browse the repository at this point in the history
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
  • Loading branch information
robUx4 committed Nov 6, 2024
1 parent b0330f9 commit c4bb5e3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion contrib/src/dav1d/rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
.dav1d: dav1d crossfile.meson
rm -rf $</build
$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
meson install -C $</build
$(MESONBUILD)
touch $@
2 changes: 1 addition & 1 deletion contrib/src/fribidi/rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
.fribidi: fribidi crossfile.meson
rm -rf $</build
$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false $</build $<
meson install -C $</build
$(MESONBUILD)
touch $@
2 changes: 1 addition & 1 deletion contrib/src/harfbuzz/rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ endif
.harfbuzz: harfbuzz crossfile.meson
rm -rf $</build
$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
meson install -C $</build
$(MESONBUILD)
touch $@
2 changes: 1 addition & 1 deletion contrib/src/libdsm/rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ endif
.libdsm: libdsm crossfile.meson
rm -rf $</build
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false $</build $<
meson install -C $</build
$(MESONBUILD)
touch $@
1 change: 1 addition & 0 deletions contrib/src/main.mak
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBD
else
MESON = meson $(MESONFLAGS)
endif
MESONBUILD = meson install -C $</build

ifeq ($(V),1)
CMAKE += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
Expand Down
2 changes: 1 addition & 1 deletion contrib/src/microdns/rules.mak
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
.microdns: microdns crossfile.meson
rm -rf $</build
$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled $</build $<
meson install -C $</build
$(MESONBUILD)
touch $@

0 comments on commit c4bb5e3

Please sign in to comment.