Add cmake build

Co-Authored-by: John Ericson <John.Ericson@Obsidian.Systems>

Author: linux-fan-dave

.gitignore

@@ -18,6 +18,8 @@ Makefile
 .deps
 *.o
 
+CMakeLists.txt.user
+
 /tests/*.log
 /tests/*.trs
 /tests/no-rpath

CMakeLists.txt

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(patchelf)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(PAGESIZE 4096)
+
+set(ADDITIONAL_HEADERS src/elf.h)
+
+set(SOURCES src/patchelf.cc)
+
+file(READ version VERSION)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${ADDITIONAL_HEADERS})
+
+target_compile_definitions(
+  patchelf PRIVATE PAGESIZE=${PAGESIZE}
+                   PACKAGE_STRING="patchelf ${VERSION_STRING}")

flake.nix

@@ -33,6 +33,7 @@
       src = lib.fileset.toSource {
         root = ./.;
         fileset = lib.fileset.unions [
+          ./CMakeLists.txt
           ./COPYING
           ./Makefile.am
           ./README.md
@@ -49,7 +50,7 @@
 
       patchelfFor =
         pkgs:
-        pkgs.callPackage ./package.nix {
+        pkgs.callPackage ./package-autoconf.nix {
           inherit version src;
         };
 
@@ -117,6 +118,8 @@
           })
         );
 
+        build-cmake = forAllSystems (system: self.packages.${system}.patchelf-cmake);
+
         # x86_64-linux seems to be only working clangStdenv at the moment
         build-sanitized-clang = lib.genAttrs [ "x86_64-linux" ] (
           system:
@@ -134,6 +137,7 @@
             self.hydraJobs.tarball
             self.hydraJobs.build.x86_64-linux
             self.hydraJobs.build.i686-linux
+            self.hydraJobs.build-cmake.x86_64-linux
             # FIXME: add aarch64 emulation to our github action...
             #self.hydraJobs.build.aarch64-linux
             self.hydraJobs.build-sanitized.x86_64-linux
@@ -172,8 +176,10 @@
                   }";
                 };
                 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
+                  #pkgs.buildPackages.cmake
+                  #pkgs.buildPackages.ninja
                   modular.pre-commit.settings.package
-                  (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)
+                  (pkgs.buildPackages.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript)
                 ];
               }
             );
@@ -194,7 +200,7 @@
 
           patchelfForWindowsStatic =
             pkgs:
-            (pkgs.callPackage ./package.nix {
+            (pkgs.callPackage ./package-autoconf.nix {
               inherit version src;
               # On windows we use win32 threads to get a static binary,
               # otherwise `-static` below doesn't work.
@@ -217,6 +223,10 @@
           patchelf = patchelfFor pkgs;
           default = self.packages.${system}.patchelf;
 
+          patchelf-cmake = pkgs.callPackage ./package-cmake.nix {
+            inherit version src;
+          };
+
           # This is a good test to see if packages can be cross-compiled. It also
           # tests if our testsuite uses target-prefixed executable names.
           patchelf-musl-cross = patchelfFor pkgs.pkgsCross.musl64;

maintainers/flake-module.nix

@@ -37,6 +37,9 @@
               fi
             ''}";
           };
+          cmake-format = {
+            enable = true;
+          };
           nixfmt-rfc-style = {
             enable = true;
           };

package.nix package-autoconf.nixpackage.nix renamed to package-autoconf.nix

@@ -0,0 +1,17 @@
+{
+  stdenv,
+  cmake,
+  ninja,
+  version,
+  src,
+}:
+
+stdenv.mkDerivation {
+  pname = "patchelf";
+  inherit version src;
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+  doCheck = true;
+}