Compare commits
4 commits
7b33084a3e
...
d98aec63b0
Author | SHA1 | Date | |
---|---|---|---|
![]() |
d98aec63b0 | ||
![]() |
7b6b4f7e5b | ||
![]() |
d205ed44b7 | ||
![]() |
e824baa4ba |
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -536,7 +536,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "servicepoint_binding_c"
|
||||
version = "0.14.1"
|
||||
version = "0.15.0"
|
||||
dependencies = [
|
||||
"cbindgen",
|
||||
"env_logger",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "servicepoint_binding_c"
|
||||
version = "0.14.1"
|
||||
version = "0.15.0"
|
||||
publish = true
|
||||
edition = "2021"
|
||||
license = "GPL-3.0-or-later"
|
||||
|
|
2
build.rs
2
build.rs
|
@ -35,7 +35,7 @@ fn main() {
|
|||
if let Ok(header_out) = env::var("SERVICEPOINT_HEADER_OUT") {
|
||||
let header_copy = header_out + "/servicepoint.h";
|
||||
|
||||
if fs::exists(&header_copy).ok().unwrap_or(false) {
|
||||
if fs::exists(&header_copy).unwrap_or(false) {
|
||||
// check if content changed to prevent rebuild of dependents if not
|
||||
|
||||
let mut bindings_text = Vec::new();
|
||||
|
|
59
devShells.nix
Normal file
59
devShells.nix
Normal file
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
pkgs,
|
||||
fenix,
|
||||
selfPkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
defaultAdditionalPkgs = with pkgs; [
|
||||
rustfmt
|
||||
clippy
|
||||
cargo-expand
|
||||
cargo-tarpaulin
|
||||
gdb
|
||||
];
|
||||
in
|
||||
(builtins.mapAttrs (
|
||||
packageName: package:
|
||||
pkgs.mkShell {
|
||||
inputsFrom = [ package ];
|
||||
packages = defaultAdditionalPkgs;
|
||||
RUST_BACKTRACE = 1;
|
||||
RUST_LOG = "all";
|
||||
}
|
||||
) selfPkgs)
|
||||
// {
|
||||
default = pkgs.mkShell {
|
||||
inputsFrom = [
|
||||
selfPkgs.servicepoint-binding-c
|
||||
selfPkgs.announce
|
||||
];
|
||||
packages =
|
||||
defaultAdditionalPkgs
|
||||
++ (with pkgs; [
|
||||
(pkgs.symlinkJoin {
|
||||
name = "rust-toolchain";
|
||||
paths = with pkgs; [
|
||||
rustc
|
||||
cargo
|
||||
rustPlatform.rustcSrc
|
||||
rustPlatform.rustLibSrc
|
||||
rustfmt
|
||||
clippy
|
||||
cargo-expand
|
||||
cargo-tarpaulin
|
||||
];
|
||||
})
|
||||
gcc
|
||||
gnumake
|
||||
xe
|
||||
libgcc
|
||||
libunwind
|
||||
pkgsStatic.gcc
|
||||
pkgsStatic.libgcc
|
||||
pkgsStatic.musl
|
||||
]);
|
||||
|
||||
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
|
||||
};
|
||||
}
|
|
@ -36,11 +36,8 @@ THIS_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
|||
REPO_ROOT := $(realpath $(THIS_DIR)/..)
|
||||
CARGO_OBJDIR := cargo/$(RUST_TARGET)/$(_profile)
|
||||
|
||||
# TODO: check if override is needed
|
||||
_rust_cli_profile := $(if $(filter $(_profile),debug),dev,$(_profile))
|
||||
|
||||
# TODO: `make LINK=static` fails with linker error "undefined reference to `_dl_find_object'" in libgcc_eh.a
|
||||
|
||||
STRIPFLAGS += -s --strip-unneeded -R .comment -R .gnu.version -R .note -R .note.gnu.build-id -R .note.ABI-tag
|
||||
STATIC_LINK_LIBS += -lservicepoint_binding_c
|
||||
|
||||
|
@ -57,7 +54,7 @@ CARGOFLAGS += --manifest-path=$(REPO_ROOT)/Cargo.toml \
|
|||
CFLAGS += -Wall -Wextra -pedantic -fwhole-program -fPIE -pie
|
||||
_no_debug_cflags := -ffunction-sections -fdata-sections -Wl,--gc-sections
|
||||
size_optimized_CFLAGS += -Oz \
|
||||
-fwrapv -fomit-frame-pointer -fno-stack-protector\
|
||||
-fwrapv -fomit-frame-pointer -fno-stack-protector \
|
||||
-fno-unroll-loops \
|
||||
-fno-unwind-tables -fno-asynchronous-unwind-tables \
|
||||
-fmerge-all-constants \
|
||||
|
@ -81,20 +78,25 @@ CFLAGS += $($(_libc)_CFLAGS) $($(_profile)_CFLAGS) $($(_link_type)_CFLAGS) $(_se
|
|||
ifeq ($(LTO), 1)
|
||||
CFLAGS += -flto
|
||||
endif
|
||||
ifeq ($(_libc),gnu)
|
||||
ifeq ($(_link_type),static)
|
||||
CFLAGS += $(error "statically linking glibc is known to be broken")
|
||||
endif
|
||||
endif
|
||||
|
||||
size_optimized_RUSTFLAGS += -Zlocation-detail=none \
|
||||
-Zfmt-debug=none \
|
||||
-C link-arg=-z,norelro \
|
||||
-C panic=abort
|
||||
#-C link-arg=--hash-style=gnu
|
||||
musl_RUSTFLAGS += --crate-type=staticlib -Ctarget-feature=-crt-static
|
||||
-C panic=abort \
|
||||
-C link-arg=-Wl,--hash-style=gnu
|
||||
static_RUSTFLAGS += --crate-type=staticlib -Ctarget-feature=+crt-static
|
||||
|
||||
RUSTFLAGS += $($(_libc)_RUSTFLAGS) $($(_profile)_RUSTFLAGS) $($(_link_type)_RUSTFLAGS)
|
||||
ifneq ($(_profile), debug)
|
||||
RUSTFLAGS += -C link-arg=-s -C link-arg=-Wl,--gc-sections
|
||||
endif
|
||||
|
||||
# TODO: wildcard does not work with VPATH
|
||||
# ADD NEW EXAMPLES HERE
|
||||
_c_src := src/announce.c src/brightness_tester.c src/header_logger.c \
|
||||
src/moving_line.c src/random_stuff.c src/wiping_clear.c
|
||||
_programs := $(basename $(notdir $(_c_src)))
|
||||
|
|
63
flake.lock
63
flake.lock
|
@ -1,25 +1,80 @@
|
|||
{
|
||||
"nodes": {
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748759782,
|
||||
"narHash": "sha256-MJNhEBsAbxRp/53qsXv6/eaWkGS8zMGX9LuCz1BLeck=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "9be40ad995bac282160ff374a47eed67c74f9c2a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1731533336,
|
||||
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "nix-filter",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1748037224,
|
||||
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=",
|
||||
"lastModified": 1748302896,
|
||||
"narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f",
|
||||
"rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nix-filter": "nix-filter",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748695646,
|
||||
"narHash": "sha256-VwSuuRF4NvAoeHZJRRlX8zAFZ+nZyuiIvmVqBAX0Bcg=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "2a388d1103450d814a84eda98efe89c01b158343",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
56
flake.nix
56
flake.nix
|
@ -2,16 +2,22 @@
|
|||
description = "Flake for the servicepoint library.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nix-filter.url = "github:numtide/nix-filter";
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
fenix,
|
||||
nix-filter
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
supported-systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
|
@ -20,52 +26,20 @@
|
|||
];
|
||||
forAllSystems =
|
||||
f:
|
||||
lib.genAttrs supported-systems (
|
||||
nixpkgs.lib.genAttrs supported-systems (
|
||||
system:
|
||||
f rec {
|
||||
inherit system self;
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
inherit system;
|
||||
lib = pkgs.lib // nix-filter.lib;
|
||||
fenix = inputs.fenix.packages.${system};
|
||||
selfPkgs = self.packages.${system};
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
devShells = forAllSystems (
|
||||
{ pkgs, system }:
|
||||
{
|
||||
default = pkgs.mkShell rec {
|
||||
buildInputs = with pkgs; [
|
||||
xe
|
||||
xz
|
||||
libgcc
|
||||
libunwind
|
||||
pkgsStatic.musl
|
||||
];
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
(pkgs.symlinkJoin {
|
||||
name = "rust-toolchain";
|
||||
paths = with pkgs; [
|
||||
rustc
|
||||
cargo
|
||||
rustPlatform.rustcSrc
|
||||
rustfmt
|
||||
clippy
|
||||
cargo-expand
|
||||
cargo-tarpaulin
|
||||
];
|
||||
})
|
||||
gcc
|
||||
gdb
|
||||
pkgsStatic.gcc
|
||||
gnumake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
packages = forAllSystems (import ./packages.nix);
|
||||
devShells = forAllSystems (import ./devShells.nix);
|
||||
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
|
||||
};
|
||||
}
|
||||
|
|
107
packages.nix
Normal file
107
packages.nix
Normal file
|
@ -0,0 +1,107 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
fenix,
|
||||
selfPkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
version = "0.15.0";
|
||||
mkServicepoint =
|
||||
{
|
||||
rustPlatform,
|
||||
buildType,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
inherit buildType version;
|
||||
|
||||
pname = "servicepoint-binding-c";
|
||||
src = lib.filter {
|
||||
root = ./.;
|
||||
include = [
|
||||
./Cargo.lock
|
||||
./Cargo.toml
|
||||
./src
|
||||
./build.rs
|
||||
./LICENSE
|
||||
./cbindgen.toml
|
||||
];
|
||||
};
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
meta = {
|
||||
description = "C bindings for the servicepoint crate.";
|
||||
homepage = "https://git.berlin.ccc.de/servicepoint/servicepoint-binding-c";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
pkgConfigModules = [ "servicepoint" ];
|
||||
};
|
||||
nativeBuildInputs = with pkgs; [ pkg-config ];
|
||||
buildInputs = with pkgs; [ xz ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p include
|
||||
export SERVICEPOINT_HEADER_OUT=$(realpath "include")
|
||||
|
||||
echo "Rust version: $(rustc --version)"
|
||||
echo "preBuild hook: set SERVICEPOINT_HEADER_OUT to $SERVICEPOINT_HEADER_OUT"
|
||||
'';
|
||||
postInstall = ''
|
||||
cp -r include $out
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
sed "s:\$out:$out:g" ${./servicepoint.pc.in} | sed "s:\$version:$version:g" > $out/lib/pkgconfig/servicepoint.pc
|
||||
'';
|
||||
});
|
||||
mkExample =
|
||||
{ name, servicepointBinding }:
|
||||
pkgs.stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "servicepoint-c-example-${name}";
|
||||
|
||||
nativeBuildInputs = with pkgs; [ pkg-config ];
|
||||
buildInputs = [ servicepointBinding ];
|
||||
src = ./example/src;
|
||||
|
||||
#dontUnpack = true;
|
||||
buildPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
gcc ${name}.c $(pkg-config --libs servicepoint --cflags) -o $out/bin/${name}
|
||||
'';
|
||||
};
|
||||
rustPlatform-stable = pkgs.rustPlatform;
|
||||
rustPlatform-unstable = pkgs.makeRustPlatform {
|
||||
cargo = fenix.minimal.cargo;
|
||||
rustc = fenix.minimal.rustc;
|
||||
};
|
||||
examples = [
|
||||
"announce"
|
||||
"brightness_tester"
|
||||
"header_logger"
|
||||
"moving_line"
|
||||
"random_stuff"
|
||||
"wiping_clear"
|
||||
];
|
||||
in
|
||||
rec {
|
||||
servicepoint-binding-c-release = mkServicepoint {
|
||||
buildType = "release";
|
||||
rustPlatform = rustPlatform-stable;
|
||||
};
|
||||
servicepoint-binding-c-size-optimized = mkServicepoint {
|
||||
buildType = "size_optimized";
|
||||
rustPlatform = rustPlatform-unstable;
|
||||
};
|
||||
servicepoint-binding-c = servicepoint-binding-c-release;
|
||||
|
||||
all-examples = pkgs.symlinkJoin {
|
||||
name = "servicepoint-all-examples";
|
||||
paths = builtins.map (e: selfPkgs.${e}) examples;
|
||||
};
|
||||
}
|
||||
// (lib.genAttrs examples (
|
||||
name:
|
||||
mkExample {
|
||||
inherit name;
|
||||
servicepointBinding = selfPkgs.servicepoint-binding-c;
|
||||
}
|
||||
))
|
6
servicepoint.pc.in
Normal file
6
servicepoint.pc.in
Normal file
|
@ -0,0 +1,6 @@
|
|||
Name: servicepoint
|
||||
Description: C bindings for the servicepoint library
|
||||
Version: $version
|
||||
URL: https://git.berlin.ccc.de/servicepoint/servicepoint-binding-c
|
||||
Libs: -L$out/lib -lservicepoint_binding_c
|
||||
Cflags: -I$out/include
|
Loading…
Reference in a new issue