[vlc-commits] [Git][videolan/vlc][master] 20 commits: contrib: aom: Allow make to communicate with jobserver
Hugo Beauzée-Luyssen (@chouquette)
gitlab at videolan.org
Sat Feb 26 15:41:41 UTC 2022
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
8c3d39bf by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: aom: Allow make to communicate with jobserver
- - - - -
140cd0a3 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: chromaprint: Allow make to communicate with jobserver
- - - - -
0d97ee8a by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: ebml: Allow make to communicate with jobserver
- - - - -
96b9ffec by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: fluid: Allow make to communicate with jobserver
- - - - -
2f71ade4 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: fluidlite: Allow make to communicate with jobserver
- - - - -
a1405bc9 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: glew: Allow make to communicate with jobserver
- - - - -
55e205a2 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: glslang: Allow make to communicate with jobserver
- - - - -
04170339 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: gme: Allow make to communicate with jobserver
- - - - -
47d42c3b by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: libeburl: Allow make to communicate with jobserver
- - - - -
c8c5541c by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: matroska: Allow make to communicate with jobserver
- - - - -
6cf7db55 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: mpcdec: Allow make to communicate with jobserver
- - - - -
83893fd0 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: mysofa: Allow make to communicate with jobserver
- - - - -
69f55567 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: openjpeg: Allow make to communicate with jobserver
- - - - -
7c5abbf3 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: projectM: Allow make to communicate with jobserver
- - - - -
a29d55b1 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: soxr: Allow make to communicate with jobserver
- - - - -
89954b5a by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: spatialaudio: Allow make to communicate with jobserver
- - - - -
ed5fd417 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: src: Allow make to communicate with jobserver
- - - - -
f941c3ca by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: taglib: Allow make to communicate with jobserver
- - - - -
2277fd97 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: x265: Allow make to communicate with jobserver
- - - - -
94415f30 by Hugo Beauzée-Luyssen at 2022-02-26T12:01:06+00:00
contrib: main.mak: Work around GNU Make bug
- - - - -
20 changed files:
- contrib/src/aom/rules.mak
- contrib/src/chromaprint/rules.mak
- contrib/src/ebml/rules.mak
- contrib/src/fluid/rules.mak
- contrib/src/fluidlite/rules.mak
- contrib/src/glew/rules.mak
- contrib/src/glslang/rules.mak
- contrib/src/gme/rules.mak
- contrib/src/libebur128/rules.mak
- contrib/src/main.mak
- contrib/src/matroska/rules.mak
- contrib/src/mpcdec/rules.mak
- contrib/src/mysofa/rules.mak
- contrib/src/openjpeg/rules.mak
- contrib/src/projectM/rules.mak
- contrib/src/soxr/rules.mak
- contrib/src/spatialaudio/rules.mak
- contrib/src/srt/rules.mak
- contrib/src/taglib/rules.mak
- contrib/src/x265/rules.mak
Changes:
=====================================
contrib/src/aom/rules.mak
=====================================
@@ -81,7 +81,7 @@ endif
rm -rf $(PREFIX)/include/aom
cd $< && rm -rf aom_build && mkdir -p aom_build
cd $</aom_build && LDFLAGS="$(AOM_LDFLAGS)" $(HOSTVARS) $(CMAKE) ../ $(AOM_CONF)
- cd $< && $(CMAKEBUILD) aom_build
+ +$(CMAKEBUILD) $</aom_build
$(call pkg_static,"aom_build/aom.pc")
- cd $</aom_build && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $</aom_build --target install
touch $@
=====================================
contrib/src/chromaprint/rules.mak
=====================================
@@ -22,5 +22,5 @@ DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg)
.chromaprint: chromaprint toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE)
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/ebml/rules.mak
=====================================
@@ -19,5 +19,5 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
.ebml: ebml toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_WIN32_IO=OFF
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/fluid/rules.mak
=====================================
@@ -43,5 +43,5 @@ FLUIDCONF := \
.fluid: fluidsynth toolchain.cmake
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" $(CMAKE) $(FLUIDCONF)
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/fluidlite/rules.mak
=====================================
@@ -28,5 +28,5 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite
.fluidlite: fluidlite toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE)
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/glew/rules.mak
=====================================
@@ -18,5 +18,5 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
.glew: glew toolchain.cmake
cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE) -DBUILD_SHARED_LIBS:BOOL=OFF -DGLEW_USE_STATIC_LIBS:BOOL=ON
- cd $</build/cmake && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $</build/cmake --target install
touch $@
=====================================
contrib/src/glslang/rules.mak
=====================================
@@ -25,5 +25,5 @@ glslang: glslang-$(GLSLANG_BASENAME).tar.xz .sum-glslang
.glslang: glslang toolchain.cmake
cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) -DBUILD_SHARED_LIBS=OFF \
-DENABLE_GLSLANG_BINARIES=OFF
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/gme/rules.mak
=====================================
@@ -19,5 +19,5 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
.gme: game-music-emu toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) .
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/libebur128/rules.mak
=====================================
@@ -21,5 +21,5 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
.libebur128: libebur128 toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE -DBUILD_SHARED_LIBS=FALSE
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/main.mak
=====================================
@@ -435,7 +435,11 @@ AUTORECONF = GTKDOCIZE=true autoreconf
endif
RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
-CMAKEBUILD := cmake --build
+# Work around for https://lists.nongnu.org/archive/html/bug-gnulib/2020-05/msg00237.html
+# When using a single command, make might take a shortcut and fork/exec
+# itself instead of relying on a shell, but a bug in gnulib ends up
+# trying to execute a cmake folder when one is found in the PATH
+CMAKEBUILD := env cmake --build
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-DCMAKE_INSTALL_PREFIX:STRING=$(PREFIX) \
-DBUILD_SHARED_LIBS:BOOL=OFF
=====================================
contrib/src/matroska/rules.mak
=====================================
@@ -23,5 +23,5 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
.matroska: matroska toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE)
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/mpcdec/rules.mak
=====================================
@@ -43,7 +43,7 @@ endif
.mpcdec: musepack toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
mkdir -p -- "$(PREFIX)/lib"
# Use globbing to work around cmake's change of destination file
cd $< && cp libmpcdec/*mpcdec_static.* "$(PREFIX)/lib/libmpcdec.a"
=====================================
contrib/src/mysofa/rules.mak
=====================================
@@ -26,6 +26,6 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
.mysofa: mysofa toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_TESTS=OFF
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/openjpeg/rules.mak
=====================================
@@ -31,5 +31,5 @@ endif
-DBUILD_PKGCONFIG_FILES=ON \
-DBUILD_CODEC:bool=OFF \
.
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/projectM/rules.mak
=====================================
@@ -43,6 +43,6 @@ DEPS_projectM = glew $(DEPS_glew)
-DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF \
-DINCLUDE-PROJECTM-QT:BOOL=OFF \
-DBUILD_PROJECTM_STATIC:BOOL=ON .
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
-cd $<; cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a $(PREFIX)/lib
touch $@
=====================================
contrib/src/soxr/rules.mak
=====================================
@@ -42,5 +42,5 @@ endif
-DWITH_OPENMP=OFF \
-DWITH_AVFFT=ON \
-Wno-dev
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/spatialaudio/rules.mak
=====================================
@@ -23,5 +23,5 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
.spatialaudio: spatialaudio toolchain.cmake
cd $< && rm -f CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/srt/rules.mak
=====================================
@@ -33,5 +33,5 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
.srt: srt toolchain.cmake
cd $< && $(HOSTVARS_PIC) CFLAGS="$(SRT_CFLAGS)" CXXFLAGS="$(SRT_CXXFLAGS)" $(CMAKE) \
-DENABLE_SHARED=OFF -DUSE_GNUTLS=ON -DENABLE_CXX11=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -21,5 +21,5 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
.taglib: taglib toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) .
- cd $< && $(CMAKEBUILD) . --target install
+ +$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/x265/rules.mak
=====================================
@@ -37,6 +37,6 @@ endif
.x265: x265 toolchain.cmake
$(REQUIRE_GPL)
cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=OFF
- cd $< && $(CMAKEBUILD) source --target install
+ +$(CMAKEBUILD) $</source --target install
sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
touch $@
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a801f6789d82e766c8a9be9afdd402f5c7d0406e...94415f30fa7771c2516a318c0ca78210c11b87ac
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a801f6789d82e766c8a9be9afdd402f5c7d0406e...94415f30fa7771c2516a318c0ca78210c11b87ac
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list