Merge pull request #434 from Tom94/update-libdeflate

Update libdeflate to fix clang build & add clang CI

Author: Tom94

.envrc

@@ -2,5 +2,6 @@ strict_env
 if [ "$(uname)" = "Linux" ]; then
     watch_file ./*.nix
     use flake
+    # use flake .#clang
 fi
 

.github/workflows/main.yml

@@ -17,16 +17,46 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm]
+        include:
+          - os: ubuntu-24.04
+            cc: gcc
+            cxx: g++
+            upload: true
+          - os: ubuntu-24.04-arm
+            cc: gcc
+            cxx: g++
+            upload: true
+          - os: ubuntu-24.04
+            cc: clang
+            cxx: clang++
+            upload: false
+          - os: ubuntu-24.04-arm
+            cc: clang
+            cxx: clang++
+            upload: false
     env:
       build_dir: "build"
       config: "Release"
-      CC: gcc
-      CXX: g++
-      APPIMAGE_EXTRACT_AND_RUN: 1# https://github.com/AppImage/AppImageKit/wiki/FUSE#docker
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
+      APPIMAGE_EXTRACT_AND_RUN: 1
     steps:
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y cmake libglu1-mesa-dev xorg-dev libdbus-1-dev libwayland-dev wayland-protocols libxkbcommon-dev libffi-dev nasm ninja-build
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            cmake \
+            libc++-dev \
+            libc++abi-dev \
+            libdbus-1-dev \
+            libffi-dev \
+            libglu1-mesa-dev \
+            libwayland-dev \
+            libxkbcommon-dev \
+            nasm \
+            ninja-build \
+            wayland-protocols \
+            xorg-dev
       - uses: actions/checkout@v1
         with:
           submodules: recursive
@@ -39,10 +69,11 @@ jobs:
         working-directory: ${{ env.build_dir }}
         run: ./tev --version
       - name: Package
+        if: matrix.upload
         working-directory: ${{ env.build_dir }}
         run: cmake --build . --config ${{ env.config }} --target package --verbose
       - name: Upload executable
-        if: github.event_name != 'pull_request'
+        if: matrix.upload && github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: Linux executable (${{ matrix.os }})

dependencies/libdeflate

@@ -6,11 +6,35 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
         package = pkgs.callPackage ./package.nix { };
+
+        ldLibraryPath = pkgs.lib.makeLibraryPath (
+          with pkgs;
+          [
+            wayland
+            libxkbcommon
+          ]
+        );
+
+        commonBuildInputs =
+          with pkgs;
+          if stdenv.isDarwin then
+            [ ]
+          else
+            [
+              binutils
+              mesa-demos # for glxinfo, eglinfo
+            ];
       in
       {
         packages = {
@@ -20,18 +44,33 @@
 
         devShells.default = pkgs.mkShell {
           inputsFrom = [ package ];
-          buildInputs = with pkgs; if stdenv.isDarwin then [ ] else [
-            gcc
-            gdb
-            binutils
-            mesa-demos # for glxinfo, eglinfo
-          ];
-          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (with pkgs; [
-            wayland
-            libxkbcommon
-          ]);
+          buildInputs =
+            commonBuildInputs
+            ++ (
+              with pkgs;
+              if stdenv.isDarwin then
+                [ ]
+              else
+                [
+                  gcc
+                  gdb
+                ]
+            );
+          LD_LIBRARY_PATH = ldLibraryPath;
         };
 
+        devShells.clang =
+          pkgs.mkShell.override
+            {
+              stdenv = pkgs.llvmPackages_22.libcxxStdenv;
+            }
+            {
+              inputsFrom = [ package ];
+              buildInputs =
+                commonBuildInputs ++ (with pkgs; if stdenv.isDarwin then [ ] else [ llvmPackages_22.lldb ]);
+              LD_LIBRARY_PATH = ldLibraryPath;
+            };
+
         apps.default = flake-utils.lib.mkApp {
           drv = package;
         };

flake.lock

@@ -313,9 +313,9 @@ template <typename T> bool fromChars(const char* begin, const char* end, T& valu
 }
 
 template <typename T> bool fromChars(std::string_view s, T& value) {
-    // Shockingly, macOS *still* does not ship a floating point from_chars() implementation -- a C++17 feature! -- so we polyfill via the
-    // much heavier stof (string alloc + exception on failed parse). TODO: remove once supported
-#ifdef __APPLE__
+    // libc++ *still* does not ship a floating-point from_chars() -- a C++17 feature!
+    // Polyfill via stof/stod (string alloc + exception on failed parse).
+#if !defined(__cpp_lib_to_chars) || __cpp_lib_to_chars < 201611L
     if constexpr (std::is_floating_point_v<T>) {
         try {
             value = std::stof(std::string{s});