Fix to build with muon and samu

laumann

Feb 9, 2024, 5:00 AM

MD6HLW6UG2CNTPMPIFNIKYSI3TWPNTPSTRW5JL33BWX6M2YOF7VAC

Dependencies

• [2] UWFHRQQ7 update readme and Makefile
• [3] BMTTQJX6 use meson builtin clang-format support
• [4] ZYBYX2TB Add new pristine subcommand
• [5] SADDDVGO makefile: add target to generate TAGS file
• [6] UVEPURUQ meson.build: build lib and link with main exe
• [7] L3HKOF4W wrap vendored zstd seekable in own file, #2
• [8] YM2LC6QP wrap vendored blake3 in own file, #2
• [9] 67HZZ5HS meson: shuffle lib and exe sources
• [10] XJ2PEH74 add meson.build
• [11] ML5XMZEU Makefile: rearrange targets
• [12] 2C2EF2GK move blake3 files to vendor/blake3
• [13] NETL2N53 Makefile: add check target
• [14] XV2V6J3L clean up Makefile
• [15] B3XLVPNC Add ani.c and initial Makefile
• [16] SMB3M6ES change: rework to make more testable
• [17] NZNIG2UL Fix lots of warnings, adjust build flags
• [18] UHHEEY5J Update README with build instructions using muon + samurai

Change contents

• edit in meson.build at line 34
  [5.14]→[5.357:423](∅→∅),[4.24]→[5.357:423](∅→∅),[5.1427]→[5.357:423](∅→∅),[5.10198]→[5.357:423](∅→∅),[5.357]→[5.357:423](∅→∅)
  − ]

  − deps = [dependency('libzstd'), dependency('libxxhash')]

  − asm = [
• replacement in meson.build at line 39
  [5.607]→[5.13:89](∅→∅)
  − lib = library('ani', sources : libsrcs, dependencies : deps, objects : asm)
  [5.607]

  [5.89]
  + deps = [dependency('libzstd'), dependency('libxxhash')]

  + add_project_dependencies(deps, language: 'c')

  +

  + lib = library('ani', sources : libsrcs, dependencies : deps)
• replacement in Makefile at line 10
  [5.14]→[2.692:720](∅→∅)
  − NINJA = ninja

  − MESON = meson
  [5.14]

  [5.0]
  + NINJA = samu

  + MESON = muon

  + B = build
• replacement in Makefile at line 15
  [5.8]→[2.721:741](∅→∅)
  − @$(NINJA) -C build
  [5.8]

  [5.286]
  + @$(NINJA) -C $(B) ani
• replacement in Makefile at line 17
  [5.293]→[2.742:779](∅→∅)
  − @$(MESON) setup --warnlevel=3 build
  [5.293]

  [5.16]
  + @$(MESON) setup $(B)
• replacement in Makefile at line 19
  [5.23]→[2.780:809](∅→∅)
  − @$(NINJA) -C build -t clean
  [5.23]

  [5.40]
  + @$(NINJA) -C $(B) -t clean
• replacement in Makefile at line 24
  [5.102]→[3.150:183](∅→∅)
  − @$(NINJA) -C build clang-format
  [5.102]

  [5.676]
  + @$(NINJA) -C $(B) clang-format
• replacement in Makefile at line 27
  [5.15188]→[5.15188:15213](∅→∅)
  − @$(MESON) test -C build
  [5.15188]

  [5.81]
  + @cd $(B) && $(MESON) test