Browse Source

contrib: remove the CMakeCache.txt at every run

Just like we do with autotools builds, we configure the target every time we
build a contrib.

In the case of cmake, touching `toolchain.cmake` does rebuild the cmake
contribs but if there's a cache it's not reconfigured and doesn't rebuild
anything.
pull/138/head
Steve Lhomme 4 years ago
committed by Hugo Beauzée-Luyssen
parent
commit
575c4acdf5
  1. 1
      contrib/src/chromaprint/rules.mak
  2. 1
      contrib/src/ebml/rules.mak
  3. 1
      contrib/src/fluid/rules.mak
  4. 1
      contrib/src/glew/rules.mak
  5. 1
      contrib/src/glslang/rules.mak
  6. 1
      contrib/src/gme/rules.mak
  7. 1
      contrib/src/libebur128/rules.mak
  8. 1
      contrib/src/matroska/rules.mak
  9. 1
      contrib/src/mpcdec/rules.mak
  10. 1
      contrib/src/openjpeg/rules.mak
  11. 1
      contrib/src/srt/rules.mak
  12. 1
      contrib/src/taglib/rules.mak
  13. 1
      contrib/src/vulkan-headers/rules.mak
  14. 1
      contrib/src/x265/rules.mak

1
contrib/src/chromaprint/rules.mak

@ -22,6 +22,7 @@ chromaprint: chromaprint-$(CHROMAPRINT_VERSION).tar.gz .sum-chromaprint
DEPS_chromaprint = ffmpeg $(DEPS_ffmpeg)
.chromaprint: chromaprint toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/ebml/rules.mak

@ -18,6 +18,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
$(MOVE)
.ebml: ebml toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/fluid/rules.mak

@ -42,6 +42,7 @@ FLUIDCONF := \
-Denable-readline=0
.fluid: fluidsynth toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) $(FLUIDCONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/glew/rules.mak

@ -17,6 +17,7 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
$(MOVE)
.glew: glew toolchain.cmake
rm -f $</build/cmake/CMakeCache.txt
cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $</build/cmake --target install
touch $@

1
contrib/src/glslang/rules.mak

@ -30,6 +30,7 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
GLSLANG_CONF := -DENABLE_GLSLANG_BINARIES=OFF
.glslang: glslang toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) $(GLSLANG_CONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/gme/rules.mak

@ -24,6 +24,7 @@ game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
GME_CONF := -DENABLE_UBSAN=OFF
.gme: game-music-emu toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) . $(GME_CONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/libebur128/rules.mak

@ -21,6 +21,7 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz .sum-libebur128
LIBEBUR128_CONF := -DENABLE_INTERNAL_QUEUE_H=TRUE
.libebur128: libebur128 toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(LIBEBUR128_CONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/matroska/rules.mak

@ -22,6 +22,7 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
$(MOVE)
.matroska: matroska toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/mpcdec/rules.mak

@ -44,6 +44,7 @@ endif
MUSE_CONF := -DSHARED=OFF
.mpcdec: musepack toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(MUSE_CONF)
+$(CMAKEBUILD) $< --target install
mkdir -p -- "$(PREFIX)/lib"

1
contrib/src/openjpeg/rules.mak

@ -29,6 +29,7 @@ endif
OPENJPEG_CONF := -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC:bool=OFF
.openjpeg: openjpeg toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE) . $(OPENJPEG_CONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/srt/rules.mak

@ -32,6 +32,7 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF
.srt: srt toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) $(SRT_CONF)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/taglib/rules.mak

@ -20,6 +20,7 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
$(MOVE)
.taglib: taglib toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS_PIC) $(CMAKE) .
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/vulkan-headers/rules.mak

@ -13,6 +13,7 @@ vulkan-headers: Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz .sum-vulkan-head
$(MOVE)
.vulkan-headers: vulkan-headers toolchain.cmake
rm -f $</CMakeCache.txt
cd $< && $(HOSTVARS) $(CMAKE)
+$(CMAKEBUILD) $< --target install
touch $@

1
contrib/src/x265/rules.mak

@ -39,6 +39,7 @@ X265_CONF := -DENABLE_SHARED=OFF -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) -DENABLE_CLI=O
.x265: x265 toolchain.cmake
$(REQUIRE_GPL)
rm -f $</source/CMakeCache.txt
cd $</source && $(HOSTVARS_PIC) $(CMAKE) $(X265_CONF)
+$(CMAKEBUILD) $</source --target install
sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"

Loading…
Cancel
Save